Merge branch 'master' of https://github.com/shopbetreuung/cleverreach-interface

Author: php-schubser

docs/install.md

@@ -7,7 +7,30 @@
 1. Loggen Sie sich in den Admin-Bereich ein
 2. Öffnen Sie die **Menüoption Module > Systemmodule**.
 3. Wählen Sie das Cleverreach Interface und klicken Sie auf Installieren.
+4. Im Ordner **/interface** eine **.htaccess**-Datei mit folgendem Inhalt erstellen
+
+```sh
+#  -----------------------------------------------------------------------------------------
+#  $Id: .htaccess 11767 2020-09-10 15:29:44Z GTB $
+#
+#  modified eCommerce Shopsoftware
+#  http://www.modified-shop.org
+#
+#  Copyright (c) 2009 - 2016 [www.modified-shop.org]
+#  -----------------------------------------------------------------------------------------
+#  based on: 
+#  (c) 2000-2001 The Exchange Project 
+#  (c) 2002-2003 osCommerce (.htaccess,v 1.4 2001/04/22); www.oscommerce.com 
+#  (c) 2003  nextcommerce (.htaccess,v 1.3 2003/08/13); www.nextcommerce.org 
+#  (c) 2003  XT-Commerce (.htaccess,v 1.3 2003/08/13); www.xt-commerce.com
+#
+#  Released under the GNU General Public License 
+#  -----------------------------------------------------------------------------------------
+#
+# This is used with Apache WebServers
+# The following blocks direct HTTP requests in this directory recursively
+
+Options -Indexes
+```
 
----
 
-#### Für dieses Modul müssen keine Änderungen vorgenommen werden.

new_files/admin/includes/modules/system/fs_cleverreach_interface.php

@@ -22,8 +22,6 @@ public function display()
         return [
             'text' => '<br /><div align="center">' .    xtc_button(BUTTON_SAVE). 
                                                         xtc_button_link(BUTTON_EXPORT, xtc_href_link("../interface/fs_cleverreach_interface.php")) .
-                                                        xtc_button_link(BUTTON_EXPORT_FILTER_AMAZON, xtc_href_link("../interface/fs_cleverreach_interface.php", 'export_filter_amazon=1'), 'name="export_filter_amazon"') . 
-                                                        xtc_button_link(BUTTON_UPDATE_RECEIVERS, xtc_href_link("../interface/fs_cleverreach_interface.php", 'update_receivers=1'), 'name="update_receivers"') . 
                                                         xtc_button_link(BUTTON_CANCEL, xtc_href_link(FILENAME_MODULE_EXPORT, 'set=' . $_GET['set'] . '&module=fs_cleverreach_interface')) . "</div>"
         ];
     }

new_files/interface/.htaccess

@@ -0,0 +1,21 @@
+#  -----------------------------------------------------------------------------------------
+#  $Id: .htaccess 11767 2020-09-10 15:29:44Z GTB $
+#
+#  modified eCommerce Shopsoftware
+#  http://www.modified-shop.org
+#
+#  Copyright (c) 2009 - 2016 [www.modified-shop.org]
+#  -----------------------------------------------------------------------------------------
+#  based on: 
+#  (c) 2000-2001 The Exchange Project 
+#  (c) 2002-2003 osCommerce (.htaccess,v 1.4 2001/04/22); www.oscommerce.com 
+#  (c) 2003  nextcommerce (.htaccess,v 1.3 2003/08/13); www.nextcommerce.org 
+#  (c) 2003  XT-Commerce (.htaccess,v 1.3 2003/08/13); www.xt-commerce.com
+#
+#  Released under the GNU General Public License 
+#  -----------------------------------------------------------------------------------------
+#
+# This is used with Apache WebServers
+# The following blocks direct HTTP requests in this directory recursively
+
+Options -Indexes

new_files/interface/fs_cleverreach_interface.php

@@ -20,7 +20,7 @@
 $rest = new \CR\tools\rest("https://rest.cleverreach.com/v2");
 
 if (trim(MODULE_FS_CLEVERREACH_INTERFACE_CLIENT_ID) == '' || trim(MODULE_FS_CLEVERREACH_INTERFACE_USERNAME) == '' || trim(MODULE_FS_CLEVERREACH_INTERFACE_PASSWORD) == '') {
-	die('Please enter all login credentials for Cleverreach!');
+	die('Bitte geben Sie alle Anmeldedaten für Cleverreach ein!');
 }
 
 $token = $rest->post('/login',
@@ -31,23 +31,20 @@
 	)
 );
 
-if ($_GET['update_receivers']) {
-	$update_receivers = $_GET['update_receivers'];
-}
-
 $rest->setAuthMode("bearer", $token);
 
 $groups = $rest->get("/groups");
 
 $group_id = MODULE_FS_CLEVERREACH_INTERFACE_GROUP_ID;
 
 if (!isset($group_id)) {
-	die('No groups found! Please create one in the Cleverreach backend');
+	die('Keine Empfänger-Gruppen gefunden! Bitte erstellen Sie eine im Cleverreach-Backend');
 }
 
+$receivers = array();
+
 if (MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_SUBSCRIBERS == 'true') {
 
-	$receivers = array();
 
 	$manual_registered_customers = xtc_db_query("SELECT
 										customers_id,
@@ -73,7 +70,7 @@
 			);
 		}
 
-		$gender_query = xtc_db_query("SELECT c.customers_gender as gender, ab.entry_country_id as country, ab.entry_city as city, ab.entry_postcode as zip, ab.entry_street_address as street, ab.entry_company as company FROM " . TABLE_CUSTOMERS . " c JOIN ".TABLE_ADDRESS_BOOK." ab ON c.customers_id = ab.customers_id WHERE customers_id = '" . $customer['customers_id'] . "' AND c.customers_default_address_id = ab.address_book_id");
+		$gender_query = xtc_db_query("SELECT c.customers_gender as gender, ab.entry_country_id as country, ab.entry_city as city, ab.entry_postcode as zip, ab.entry_street_address as street, ab.entry_company as company FROM " . TABLE_CUSTOMERS . " c JOIN ".TABLE_ADDRESS_BOOK." ab ON c.customers_id = ab.customers_id WHERE c.customers_id = '" . $customer['customers_id'] . "' AND c.customers_default_address_id = ab.address_book_id AND c.customers_email_address NOT LIKE '%@marketplace.amazon.de%'");
 		$customers_data = xtc_db_fetch_array($gender_query);
 		$country = xtc_get_country_name($customers_data['country']);
 
@@ -93,16 +90,7 @@
 							"company" => $customers_data["company"]
 					),
 					"orders" => $orders
-			);
-
-		if ($update_receivers) {
-			$deleted = $rest->delete("/groups.json/".$group_id."/receivers/".$customer["email"]);
-		}
-
-		if (count($receivers) > 1000) {
-			$rest->post("/groups.json/".$group_id."/receivers", $receivers);
-			$receivers = array();
-		}
+		);
 	}
 }
 
@@ -126,13 +114,12 @@
 				"source"     => STORE_NAME          //optional
 			);
 
-		$flagged_customers = xtc_db_query("	SELECT c.customers_date_added as registered, c.customers_gender as gender, c.customers_dob as dob FROM " . TABLE_CUSTOMERS . " c WHERE c.customers_id = '" . $order_row["customers_id"] . "' " . $where_clause);
-		$receivers = array('postdata' =>  array());
+        $flagged_customers = xtc_db_query("SELECT c.customers_date_added as registered, c.customers_gender as gender, c.customers_dob as dob FROM " . TABLE_CUSTOMERS . " c WHERE c.customers_id = '" . $order_row["customers_id"] . "' AND customers_email_address NOT LIKE '%@marketplace.amazon.de%'");
 
 		if (xtc_db_num_rows($flagged_customers) > 0) {
 			while ($customer = xtc_db_fetch_array($flagged_customers)) {
 
-				$receivers["postdata"][] = array(
+				$receivers[] = array(
 					"email"			=> $order_row["email"],
 					"activated"		=> strtotime($customer["registered"]),
 					"registered"	=> strtotime($customer["registered"]),
@@ -149,51 +136,22 @@
 						),
 					"orders" => $orders
 				);
-
-				if ($update_receivers) {
-					$rest->delete("/groups.json/".$group_id."/receivers/".$order_row["email"]);
-				}
-
-				if (count($receivers) > 1000) {
-					$rest->post("/groups.json/".$group_id."/receivers", $receivers);
-					$receivers = array();
-				}
-			}
-		} else {
-			$receivers["postdata"][] = array(
-				"email"			=> $order_row["email"],
-				"activated"		=> strtotime($order_row["date_purchased"]),
-				"registered"	=> strtotime($order_row["date_purchased"]),
-				"source"		=> STORE_NAME,
-				"attributes"	=> array(
-						"nachname" => utf8_encode($order_row["firstname"]),
-						"vorname" =>  utf8_encode($order_row["lastname"]),
-						"m__nnlich_weiblich" =>    $customer["gender"],
-						"geburtsdatum" => $customer['dob'],
-						"ort"	=> utf8_encode($order_row["city"]),
-						"street" => utf8_encode($order_row["street"]),
-						"zip" => $order_row["zip"],
-						"country" => utf8_encode($order_row["country"])
-				),
-				"orders" => $orders
-			);
-
-			if ($update_receivers) {
-				$rest->delete("/groups.json/".$group_id."/receivers/".$order_row["email"]);
-			}
-
-			if (count($receivers) > 1000) {
-				$rest->post("/groups.json/".$group_id."/receivers", $receivers);
-				$receivers = array();
 			}
 		}
 	}
 }
 
 if (count($receivers) > 0) {
-	$rest->post("/groups.json/".$group_id."/receivers", $receivers);
+	foreach ($receivers as $receiver) {
+		$response = $rest->get("/groups.json/".$group_id."/receivers/", $receiver["email"]);
+		if(!$response) {
+			$rest->post("/groups.json/".$group_id."/receivers", $receiver);
+		} else {
+			$rest->put("/groups.json/".$group_id."/receivers/".$receiver["email"], json_encode($receiver));
+		}
+	}
 } else {
-	die('No new receivers found');
+	die('Keine neuen Daten gefunden');
 }
 $receivers = array();
 

new_files/interface/fs_cleverreach_interface_rest_client.php

@@ -72,12 +72,13 @@ public function get($path, $data = false, $mode = "get")
     {
         $this->resetDebug();
         if (is_string($data)) {
-            if (!$data = json_decode($data)) {
-                throw new \Exception("data is string but no JSON");
+            if (is_string($data)) {
+                $url = sprintf("%s%s", $this->url . $path, ($data ? $data : ""));
+            } else {
+                $url = sprintf("%s?%s", $this->url . $path, ($data ? http_build_query($data) : ""));
             }
         }
 
-        $url = sprintf("%s?%s", $this->url . $path, ($data ? http_build_query($data) : ""));
         $this->debug("url", $url);
 
         $curl = curl_init($url);
@@ -278,7 +279,7 @@ private function returnResult($in, $header = false)
                 }
 
                 if ($this->throwExceptions) {
-                    throw new \Exception('' . $header["http_code"] . ';' . $message);
+                    // throw new \Exception('' . $header["http_code"] . ';' . $message);
                 }
                 $in = null;
 

new_files/lang/english/modules/system/fs_cleverreach_interface.php

@@ -16,6 +16,3 @@
 define('MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_BUYERS_DESC', '');
 define('MODULE_FS_CLEVERREACH_INTERFACE_GROUP_ID_TITLE', 'CleverReach Group ID');
 define('MODULE_FS_CLEVERREACH_INTERFACE_GROUP_ID_DESC', '');
-
-define('BUTTON_EXPORT_FILTER_AMAZON', 'Filter Amazon customers');
-define('BUTTON_UPDATE_RECEIVERS', 'Update receivers');

new_files/lang/german/modules/system/fs_cleverreach_interface.php

@@ -1,6 +1,6 @@
 <?php
 define('MODULE_FS_CLEVERREACH_INTERFACE_TITLE', 'CleverReach Interface © by <a href="https://www.shopbetreuung.com/" target="_blank" style="color: #007bff; font-size: inherit; font-weight: inherit;">FishnetServices</a>');
-define('MODULE_FS_CLEVERREACH_INTERFACE_LONG_DESCRIPTION', 'Dieses Modul f&uuml;gt eine Schnittstelle zum Newsletteranbieter <a href="http://www.cleverreach.de/?rk=xcetomni" target="_blank"><strong>CleverReach</strong></a> hinzu. Im Admin k&ouml;nnen Sie dann unter <strong>Module</strong> -> <strong>System Module</strong> Ihre Daten eintragen. Es ist der Export in eine Kundengruppe m&oouml;glich.');
+define('MODULE_FS_CLEVERREACH_INTERFACE_LONG_DESCRIPTION', 'Dieses Modul f&uuml;gt eine Schnittstelle zum Newsletteranbieter <a href="http://www.cleverreach.de/?rk=xcetomni" target="_blank"><strong>CleverReach</strong></a> hinzu. Im Admin k&ouml;nnen Sie dann unter <strong>Module</strong> -> <strong>System Module</strong> Ihre Daten eintragen. Es ist der Export in eine Kundengruppe m&ouml;glich.');
 define('MODULE_FS_CLEVERREACH_INTERFACE_STATUS_TITLE', 'Modul aktivieren?');
 define('MODULE_FS_CLEVERREACH_INTERFACE_STATUS_DESC', 'Modul status');
 
@@ -16,6 +16,3 @@
 define('MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_BUYERS_DESC', '');
 define('MODULE_FS_CLEVERREACH_INTERFACE_GROUP_ID_TITLE', 'CleverReach Gruppen-ID');
 define('MODULE_FS_CLEVERREACH_INTERFACE_GROUP_ID_DESC', '');
-
-define('BUTTON_EXPORT_FILTER_AMAZON', 'Amazon Kunden ausfiltern');
-define('BUTTON_UPDATE_RECEIVERS', 'Update Empf&auml;ger');