From 59841e21e4a6ec85d208b66d55e2c1a50d0e60ee Mon Sep 17 00:00:00 2001
From: Akolzin Dmitry <iyzoer@users.noreply.github.com>
Date: Mon, 13 Nov 2017 11:19:24 +0300
Subject: [PATCH] Fix customization (#24)

* Fix custom directory
* Rename plugin directory
---
 retailcrm/include-custom/.gitkeep             |  0
 retailcrm/index.php                           |  1 -
 .../api/class-wc-retailcrm-client-v3.php      |  0
 .../api/class-wc-retailcrm-client-v4.php      |  0
 .../api/class-wc-retailcrm-client-v5.php      |  0
 .../api/class-wc-retailcrm-exception-curl.php |  0
 .../api/class-wc-retailcrm-exception-json.php |  0
 .../include/api/class-wc-retailcrm-proxy.php  |  5 +-
 .../api/class-wc-retailcrm-request.php        |  0
 .../api/class-wc-retailcrm-response.php       |  0
 .../include/api}/index.php                    |  0
 .../include/class-wc-retailcrm-base.php       |  0
 .../include/class-wc-retailcrm-customers.php  |  0
 .../include/class-wc-retailcrm-history.php    |  0
 .../include/class-wc-retailcrm-icml.php       |  0
 .../class-wc-retailcrm-inventories.php        |  0
 .../include/class-wc-retailcrm-orders.php     |  0
 .../api => woo-retailcrm/include}/index.php   |  0
 .../include => woo-retailcrm}/index.php       |  0
 {retailcrm => woo-retailcrm}/retailcrm.php    | 89 ++++++++++++++-----
 {retailcrm => woo-retailcrm}/uninstall.php    |  0
 21 files changed, 71 insertions(+), 24 deletions(-)
 delete mode 100644 retailcrm/include-custom/.gitkeep
 delete mode 100644 retailcrm/index.php
 rename {retailcrm => woo-retailcrm}/include/api/class-wc-retailcrm-client-v3.php (100%)
 rename {retailcrm => woo-retailcrm}/include/api/class-wc-retailcrm-client-v4.php (100%)
 rename {retailcrm => woo-retailcrm}/include/api/class-wc-retailcrm-client-v5.php (100%)
 rename {retailcrm => woo-retailcrm}/include/api/class-wc-retailcrm-exception-curl.php (100%)
 rename {retailcrm => woo-retailcrm}/include/api/class-wc-retailcrm-exception-json.php (100%)
 rename {retailcrm => woo-retailcrm}/include/api/class-wc-retailcrm-proxy.php (97%)
 rename {retailcrm => woo-retailcrm}/include/api/class-wc-retailcrm-request.php (100%)
 rename {retailcrm => woo-retailcrm}/include/api/class-wc-retailcrm-response.php (100%)
 rename {retailcrm/include-custom => woo-retailcrm/include/api}/index.php (100%)
 rename {retailcrm => woo-retailcrm}/include/class-wc-retailcrm-base.php (100%)
 rename {retailcrm => woo-retailcrm}/include/class-wc-retailcrm-customers.php (100%)
 rename {retailcrm => woo-retailcrm}/include/class-wc-retailcrm-history.php (100%)
 rename {retailcrm => woo-retailcrm}/include/class-wc-retailcrm-icml.php (100%)
 rename {retailcrm => woo-retailcrm}/include/class-wc-retailcrm-inventories.php (100%)
 rename {retailcrm => woo-retailcrm}/include/class-wc-retailcrm-orders.php (100%)
 rename {retailcrm/include/api => woo-retailcrm/include}/index.php (100%)
 rename {retailcrm/include => woo-retailcrm}/index.php (100%)
 rename {retailcrm => woo-retailcrm}/retailcrm.php (79%)
 rename {retailcrm => woo-retailcrm}/uninstall.php (100%)

diff --git a/retailcrm/include-custom/.gitkeep b/retailcrm/include-custom/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/retailcrm/index.php b/retailcrm/index.php
deleted file mode 100644
index e71af0e..0000000
--- a/retailcrm/index.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php // Silence is golden
\ No newline at end of file
diff --git a/retailcrm/include/api/class-wc-retailcrm-client-v3.php b/woo-retailcrm/include/api/class-wc-retailcrm-client-v3.php
similarity index 100%
rename from retailcrm/include/api/class-wc-retailcrm-client-v3.php
rename to woo-retailcrm/include/api/class-wc-retailcrm-client-v3.php
diff --git a/retailcrm/include/api/class-wc-retailcrm-client-v4.php b/woo-retailcrm/include/api/class-wc-retailcrm-client-v4.php
similarity index 100%
rename from retailcrm/include/api/class-wc-retailcrm-client-v4.php
rename to woo-retailcrm/include/api/class-wc-retailcrm-client-v4.php
diff --git a/retailcrm/include/api/class-wc-retailcrm-client-v5.php b/woo-retailcrm/include/api/class-wc-retailcrm-client-v5.php
similarity index 100%
rename from retailcrm/include/api/class-wc-retailcrm-client-v5.php
rename to woo-retailcrm/include/api/class-wc-retailcrm-client-v5.php
diff --git a/retailcrm/include/api/class-wc-retailcrm-exception-curl.php b/woo-retailcrm/include/api/class-wc-retailcrm-exception-curl.php
similarity index 100%
rename from retailcrm/include/api/class-wc-retailcrm-exception-curl.php
rename to woo-retailcrm/include/api/class-wc-retailcrm-exception-curl.php
diff --git a/retailcrm/include/api/class-wc-retailcrm-exception-json.php b/woo-retailcrm/include/api/class-wc-retailcrm-exception-json.php
similarity index 100%
rename from retailcrm/include/api/class-wc-retailcrm-exception-json.php
rename to woo-retailcrm/include/api/class-wc-retailcrm-exception-json.php
diff --git a/retailcrm/include/api/class-wc-retailcrm-proxy.php b/woo-retailcrm/include/api/class-wc-retailcrm-proxy.php
similarity index 97%
rename from retailcrm/include/api/class-wc-retailcrm-proxy.php
rename to woo-retailcrm/include/api/class-wc-retailcrm-proxy.php
index 1b1eee0..f4e4d15 100644
--- a/retailcrm/include/api/class-wc-retailcrm-proxy.php
+++ b/woo-retailcrm/include/api/class-wc-retailcrm-proxy.php
@@ -14,6 +14,9 @@ if ( ! class_exists( 'WC_Retailcrm_Proxy' ) ) :
      */
     class WC_Retailcrm_Proxy
     {
+        protected $retailcrm;
+        protected $logger;
+
         public function __construct($api_url, $api_key, $api_vers = null)
         {   
             $this->logger = new WC_Logger();
@@ -50,7 +53,7 @@ if ( ! class_exists( 'WC_Retailcrm_Proxy' ) ) :
 
         public function __call($method, $arguments)
         {
-            if (!isset($this->retailcrm)) {
+            if (!$this->retailcrm) {
                 return;
             }
             
diff --git a/retailcrm/include/api/class-wc-retailcrm-request.php b/woo-retailcrm/include/api/class-wc-retailcrm-request.php
similarity index 100%
rename from retailcrm/include/api/class-wc-retailcrm-request.php
rename to woo-retailcrm/include/api/class-wc-retailcrm-request.php
diff --git a/retailcrm/include/api/class-wc-retailcrm-response.php b/woo-retailcrm/include/api/class-wc-retailcrm-response.php
similarity index 100%
rename from retailcrm/include/api/class-wc-retailcrm-response.php
rename to woo-retailcrm/include/api/class-wc-retailcrm-response.php
diff --git a/retailcrm/include-custom/index.php b/woo-retailcrm/include/api/index.php
similarity index 100%
rename from retailcrm/include-custom/index.php
rename to woo-retailcrm/include/api/index.php
diff --git a/retailcrm/include/class-wc-retailcrm-base.php b/woo-retailcrm/include/class-wc-retailcrm-base.php
similarity index 100%
rename from retailcrm/include/class-wc-retailcrm-base.php
rename to woo-retailcrm/include/class-wc-retailcrm-base.php
diff --git a/retailcrm/include/class-wc-retailcrm-customers.php b/woo-retailcrm/include/class-wc-retailcrm-customers.php
similarity index 100%
rename from retailcrm/include/class-wc-retailcrm-customers.php
rename to woo-retailcrm/include/class-wc-retailcrm-customers.php
diff --git a/retailcrm/include/class-wc-retailcrm-history.php b/woo-retailcrm/include/class-wc-retailcrm-history.php
similarity index 100%
rename from retailcrm/include/class-wc-retailcrm-history.php
rename to woo-retailcrm/include/class-wc-retailcrm-history.php
diff --git a/retailcrm/include/class-wc-retailcrm-icml.php b/woo-retailcrm/include/class-wc-retailcrm-icml.php
similarity index 100%
rename from retailcrm/include/class-wc-retailcrm-icml.php
rename to woo-retailcrm/include/class-wc-retailcrm-icml.php
diff --git a/retailcrm/include/class-wc-retailcrm-inventories.php b/woo-retailcrm/include/class-wc-retailcrm-inventories.php
similarity index 100%
rename from retailcrm/include/class-wc-retailcrm-inventories.php
rename to woo-retailcrm/include/class-wc-retailcrm-inventories.php
diff --git a/retailcrm/include/class-wc-retailcrm-orders.php b/woo-retailcrm/include/class-wc-retailcrm-orders.php
similarity index 100%
rename from retailcrm/include/class-wc-retailcrm-orders.php
rename to woo-retailcrm/include/class-wc-retailcrm-orders.php
diff --git a/retailcrm/include/api/index.php b/woo-retailcrm/include/index.php
similarity index 100%
rename from retailcrm/include/api/index.php
rename to woo-retailcrm/include/index.php
diff --git a/retailcrm/include/index.php b/woo-retailcrm/index.php
similarity index 100%
rename from retailcrm/include/index.php
rename to woo-retailcrm/index.php
diff --git a/retailcrm/retailcrm.php b/woo-retailcrm/retailcrm.php
similarity index 79%
rename from retailcrm/retailcrm.php
rename to woo-retailcrm/retailcrm.php
index 2d17995..ae5a491 100644
--- a/retailcrm/retailcrm.php
+++ b/woo-retailcrm/retailcrm.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Version: 1.1
+ * Version: 1.2.1
  * Plugin Name: WooCommerce RetailCRM
- * Plugin URI: https://wordpress.org/plugins/retailcrm/
+ * Plugin URI: https://wordpress.org/plugins/woo-retailcrm/
  * Description: Integration plugin for WooCommerce & RetailCRM
  * Author: RetailDriver LLC
  * Author URI: http://retailcrm.ru/
@@ -55,22 +55,67 @@ if (!class_exists( 'WC_Integration_Retailcrm')) :
     $WC_Integration_Retailcrm = new WC_Integration_Retailcrm( __FILE__ );
 endif;
 
+/*
+ * Check icml custom class
+ */
 function check_custom_icml()
 {
-    if (file_exists( __DIR__ . '/include-custom/class-wc-retailcrm-icml.php' )) {
-        $file = '/include-custom/class-wc-retailcrm-icml.php';
+    if (file_exists( WP_CONTENT_DIR . '/retailcrm-custom/class-wc-retailcrm-icml.php' )) {
+        $file = WP_CONTENT_DIR . '/retailcrm-custom/class-wc-retailcrm-icml.php';
     } else {
-        $file = '/include/class-wc-retailcrm-icml.php';
+        $file = __DIR__ . '/include/class-wc-retailcrm-icml.php';
     }
     return $file;
 }
 
-function check_custom_order()
+/*
+ * Check orders custom class
+ */
+function check_custom_orders()
 {
-    if (file_exists( __DIR__ . '/include-custom/class-wc-retailcrm-orders.php' )) {
-        $file = '/include-custom/class-wc-retailcrm-orders.php';
+    if (file_exists( WP_CONTENT_DIR . '/retailcrm-custom/class-wc-retailcrm-orders.php' )) {
+        $file =  WP_CONTENT_DIR . '/retailcrm-custom/class-wc-retailcrm-orders.php';
     } else {
-        $file = '/include/class-wc-retailcrm-orders.php';
+        $file = __DIR__ . '/include/class-wc-retailcrm-orders.php';
+    }
+    return $file;
+}
+
+/*
+ * Check customers custom class
+ */
+function check_custom_customers()
+{
+    if (file_exists( WP_CONTENT_DIR . '/retailcrm-custom/class-wc-retailcrm-customers.php' )) {
+        $file = WP_CONTENT_DIR . '/retailcrm-custom/class-wc-retailcrm-customers.php';
+    } else {
+        $file = __DIR__ . '/include/class-wc-retailcrm-customers.php';
+    }
+    return $file;
+}
+
+/*
+ * Check inventories custom class
+ */
+function check_custom_inventories()
+{
+    if (file_exists( WP_CONTENT_DIR . '/retailcrm-custom/class-wc-retailcrm-inventories.php' )) {
+        $file = WP_CONTENT_DIR . '/retailcrm-custom/class-wc-retailcrm-inventories.php';
+    } else {
+        $file = __DIR__ . '/include/class-wc-retailcrm-inventories.php';
+    }
+    return $file;
+}
+
+/*
+ * Check history custom class
+ */
+function check_custom_history()
+{
+    if (file_exists( WP_CONTENT_DIR . '/retailcrm-custom/class-wc-retailcrm-history.php' )) {
+        $file = WP_CONTENT_DIR . '/retailcrm-custom/class-wc-retailcrm-history.php';
+    } else {
+        $file = __DIR__ . '/include/class-wc-retailcrm-history.php';
     }
     return $file;
 }
@@ -101,7 +146,7 @@ function retailcrm_deactivation()
 function load_stocks()
 {
     if ( ! class_exists( 'WC_Retailcrm_Inventories' ) ) {
-        include_once( __DIR__ . '/include/class-wc-retailcrm-inventories.php' );
+        include_once( check_custom_inventories() );
     }
 
     $inventories = new WC_Retailcrm_Inventories();
@@ -114,7 +159,7 @@ function load_stocks()
 function generate_icml() 
 {
     if ( ! class_exists( 'WC_Retailcrm_Icml' ) ) {
-        include_once( __DIR__ . check_custom_icml() );
+        include_once( check_custom_icml() );
     }
 
     $icml = new WC_Retailcrm_Icml();
@@ -129,7 +174,7 @@ function generate_icml()
 function retailcrm_process_order($order_id)
 {
     if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) {
-        include_once( __DIR__ . check_custom_order() );
+        include_once( check_custom_orders() );
     }
 
     $order_class = new WC_Retailcrm_Orders();
@@ -144,7 +189,7 @@ function retailcrm_process_order($order_id)
 function retailcrm_update_order_status($order_id)
 {
     if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) {
-        include_once( __DIR__ . check_custom_order() );
+        include_once( check_custom_orders() );
     }
 
     $order_class = new WC_Retailcrm_Orders();
@@ -159,7 +204,7 @@ function retailcrm_update_order_status($order_id)
 function retailcrm_update_order_payment($order_id)
 {
     if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) {
-        include_once( __DIR__ . check_custom_order() );
+        include_once( check_custom_orders() );
     }
 
     $order_class = new WC_Retailcrm_Orders();
@@ -174,7 +219,7 @@ function retailcrm_update_order_payment($order_id)
 function retailcrm_update_order($meta_id, $order_id, $meta_key, $_meta_value)
 {   
     if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) {
-        include_once( __DIR__ . check_custom_order() );
+        include_once( check_custom_orders() );
     }
     $order_class = new WC_Retailcrm_Orders();
 
@@ -208,7 +253,7 @@ function retailcrm_update_order($meta_id, $order_id, $meta_key, $_meta_value)
 function retailcrm_update_order_items($order_id, $data)
 {   
     if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) {
-        include_once( __DIR__ . check_custom_order() );
+        include_once( check_custom_orders() );
     }
 
     $order_class = new WC_Retailcrm_Orders();
@@ -218,7 +263,7 @@ function retailcrm_update_order_items($order_id, $data)
 function retailcrm_history_get()
 {
     if ( ! class_exists( 'WC_Retailcrm_History' ) ) {
-        include_once( __DIR__ . '/include/class-wc-retailcrm-history.php' );
+        include_once( check_custom_history() );
     }
 
     $history_class = new WC_Retailcrm_History();
@@ -227,7 +272,7 @@ function retailcrm_history_get()
 
 function create_customer($customer_id) {
     if ( ! class_exists( 'WC_Retailcrm_Customers' ) ) {
-        include_once( __DIR__ . '/include/class-wc-retailcrm-customers.php' );
+        include_once( check_custom_customers() );
     }
 
     $customer_class = new WC_Retailcrm_Customers();
@@ -236,7 +281,7 @@ function create_customer($customer_id) {
 
 function update_customer($customer_id, $data) {
     if ( ! class_exists( 'WC_Retailcrm_Customers' ) ) {
-        include_once( __DIR__ . '/include/class-wc-retailcrm-customers.php' );
+        include_once( check_custom_customers() );
     }
 
     $customer_class = new WC_Retailcrm_Customers();
@@ -285,11 +330,11 @@ function filter_cron_schedules($param) {
 
 function upload_to_crm() {
     if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) {
-        include_once( __DIR__ . check_custom_order() );
+        include_once( check_custom_orders() );
     }
 
     if ( ! class_exists( 'WC_Retailcrm_Customers' ) ) {
-        include_once( __DIR__ . '/include/class-wc-retailcrm-customers.php' );
+        include_once( check_custom_customers() );
     }
 
     $options = array_filter(get_option( 'woocommerce_integration-retailcrm_settings' ));
@@ -323,7 +368,7 @@ function ajax_upload() {
 
 function update_order($order_id) {
     if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) {
-        include_once( __DIR__ . check_custom_order() );
+        include_once( check_custom_orders() );
     }
 
     $order_class = new WC_Retailcrm_Orders();
diff --git a/retailcrm/uninstall.php b/woo-retailcrm/uninstall.php
similarity index 100%
rename from retailcrm/uninstall.php
rename to woo-retailcrm/uninstall.php