WordPress.org
Get WordPress

Plugin Directory

Changeset 1473005


Ignore:
Timestamp:
08/12/2016 11:36:39 AM (10 years ago)
Author:
Onlineforce
Message:

version 1.9.20 released!

  • Improvements and Bug fixes.
Location:
woocommerce-e-conomic-integration
Files:
55 added
3 edited

Legend:

Unmodified
Added
Removed

  • woocommerce-e-conomic-integration/trunk/class-economic-api.php

    r1468483 r1473005  
    8383   
    8484    public $product_sync;
     85   
     86    public $product_stock_sync;
    8587   
    8688    /** @public alphanumber corresponding the order referernce offset */
    … …  
    415417        $this->appToken = '15MjebGLGLPv4_I90Wy8EqzcXwThPmrY5iRNlG0H3_w1';
    416418        $this->product_sync = isset($options['product-sync'])? $options['product-sync'] : '';
     419        $this->product_stock_sync = isset($options['product-stock-sync'])? $options['product-stock-sync'] : '';
    417420        $this->other_checkout = isset($options['other-checkout'])? $options['other-checkout'] : '';
    418421        $this->economic_checkout = isset($options['economic-checkout'])? $options['economic-checkout'] : '';
    … …  
    439442      $opts = array(
    440443          'http' => array(
    441             'header' => "X-EconomicAppIdentifier:  WooCommerce e-conomic Integration/1.9.20 (http://wooconomics.com/; [email protected]) PHP-SOAP/1.0\r\n"
     444            'header' => "X-EconomicAppIdentifier:  WooCommerce e-conomic Integration/1.9.21 (http://wooconomics.com/; [email protected]) PHP-SOAP/1.0\r\n"
    442445          )
    443446      );
    … …  
    20502053                    $product = $modified_product;
    20512054                }
    2052                 if($product->managing_stock()){
     2055                if($product->managing_stock() && $this->product_stock_sync == "on"){
    20532056                    ($product_data->InStock !=0 || $product_data->InStock =='') ? $product->set_stock($product_data->InStock) : logthis('Product stock not updated.');
    20542057                    logthis('Product: '.$product->get_title().' Stock updated to '.$product_data->InStock);
    20552058                }else{
    2056                     logthis('Product: '.$product->get_title().' Stock management disabled');
     2059                    if($this->product_stock_sync != "on"){
     2060                        logthis('Product: '.$product->get_title().' Stock sync is disabled in plugin settings!');
     2061                    }else{
     2062                        logthis('Product: '.$product->get_title().' Stock management disabled');
     2063                    }
    20572064                }
    20582065                //Added for addon
    … …  
    21332140                    $product = $modified_product;
    21342141                }
    2135                 if($product->managing_stock()){
     2142                if($product->managing_stock() && $this->product_stock_sync == "on"){
    21362143                    ($product_data->InStock !=0 || $product_data->InStock =='') ? $product->set_stock($product_data->InStock) : logthis('Product stock not updated.');
    21372144                    logthis('Product: '.$product->get_title().' Stock updated to '.$product_data->InStock);
    21382145                }else{
    2139                     logthis('Product: '.$product->get_title().' Stock management disabled');
     2146                    if($this->product_stock_sync != "on"){
     2147                        logthis('Product: '.$product->get_title().' Stock sync is disabled in plugin settings!');
     2148                    }else{
     2149                        logthis('Product: '.$product->get_title().' Stock management disabled');
     2150                    }
    21402151                }
    21412152                //Added for addon
    … …  
    22182229                    if($this->product_sync != "on"){
    22192230                        if($product->managing_stock()){
    2220                             array_push($sync_log, array('status' => __('success', 'woocommerce-e-conomic-integration'), 'sku' => $product->sku, 'name' => $product->get_title(), 'msg' => __('Product sync: Disabled! Use "Activate product sync" settings to enable it. <br> Product stock sync: Successfull!', 'woocommerce-e-conomic-integration') ));
     2231                            $message = 'Product sync: Disabled! Use "Activate product sync" settings to enable it.';
     2232                            $message = $this->product_stock_sync == "on" ? $message.'<br> Product stock sync: Successfull!' : '<br> Product stock sync disabled!';
     2233                            array_push($sync_log, array('status' => __('success', 'woocommerce-e-conomic-integration'), 'sku' => $product->sku, 'name' => $product->get_title(), 'msg' => __($message, 'woocommerce-e-conomic-integration') ));
    22212234                        }else{
    2222                             array_push($sync_log, array('status' => __('success', 'woocommerce-e-conomic-integration'), 'sku' => $product->sku, 'name' => $product->get_title(), 'msg' => __('Product sync: Disabled! Use "Activate product sync" settings to enable it. <br> Product stock sync: Stock management disabled, Stock management can be enabled at Product->Inventory.', 'woocommerce-e-conomic-integration') ));
     2235                            $message = 'Product sync: Disabled! Use "Activate product sync" settings to enable it. <br> Product stock sync: Stock management disabled, Stock management can be enabled at Product->Inventory.';
     2236                            $message = $this->product_stock_sync == "on" ? $message.'<br> Product stock sync: Successfull!' : $message.'<br> Product stock sync disabled!';
     2237                            array_push($sync_log, array('status' => __('success', 'woocommerce-e-conomic-integration'), 'sku' => $product->sku, 'name' => $product->get_title(), 'msg' => __('', 'woocommerce-e-conomic-integration') ));
    22232238                        }
    22242239                    }else{
    22252240                        if($product->managing_stock()){
    2226                             array_push($sync_log, array('status' => __('success', 'woocommerce-e-conomic-integration'), 'sku' => $product->sku, 'name' => $product->get_title(), 'msg' => __('Product sync: Successful! <br> Product stock sync: Successfull!', 'woocommerce-e-conomic-integration') ));
     2241                            $message = 'Product sync: Successful!';
     2242                            $message = $this->product_stock_sync == "on" ? $message.'<br> Product stock sync: Successfull!' : '<br> Product stock sync disabled!';
     2243                            array_push($sync_log, array('status' => __('success', 'woocommerce-e-conomic-integration'), 'sku' => $product->sku, 'name' => $product->get_title(), 'msg' => __($message, 'woocommerce-e-conomic-integration') ));
    22272244                        }else{
    2228                             array_push($sync_log, array('status' => __('success', 'woocommerce-e-conomic-integration'), 'sku' => $product->sku, 'name' => $product->get_title(), 'msg' => __('Product sync: Successful! <br> Product stock sync: Stock management disabled, Stock management can be enabled at Product->Inventory.', 'woocommerce-e-conomic-integration') ));
     2245                            $message = 'Product sync: Successful! <br> Product stock sync: Stock management disabled, Stock management can be enabled at Product->Inventory.';
     2246                            $message = $this->product_stock_sync == "on" ? $message.'<br> Product stock sync: Successfull!' : $message.'<br> Product stock sync disabled!';
     2247                            array_push($sync_log, array('status' => __('success', 'woocommerce-e-conomic-integration'), 'sku' => $product->sku, 'name' => $product->get_title(), 'msg' => __($message, 'woocommerce-e-conomic-integration') ));
    22292248                        }
    22302249                    }
    … …  
    23842403                        //update_post_meta( $post_id, '_sale_price', (int) $product_data->SalesPrice );
    23852404                        $productStock = (int)$product_data->InStock;
    2386                         if($product->managing_stock()){
     2405                        if($product->managing_stock() && $this->product_stock_sync == "on"){
    23872406                            if( $productStock > 0){
    23882407                                logthis('Product stock updated to: '.$productStock);
    … …  
    23992418                        }
    24002419                    }else{
    2401                         if($product->managing_stock()){
     2420                        if($product->managing_stock() && $this->product_stock_sync == "on"){
    24022421                            logthis($product_data);
    24032422                            ($productStock !=0 || $productStock =='') ? $product->set_stock($productStock) : logthis('Product stock not updated.');
    … …  
    27322751            if($order != NULL){
    27332752                logthis("woo_save_customer_meta_data_to_economic key: " . $meta_key . " value: " . $order->billing_ean_number);
    2734                 $client->Debtor_SetEan(array(
    2735                     'debtorHandle' => $debtor_handle,
    2736                     'value' => $order->billing_ean_number
    2737                 ));
     2753                if($order->billing_ean_number != '' && $order->billing_ean_number != NULL){
     2754                    $client->Debtor_SetEan(array(
     2755                        'debtorHandle' => $debtor_handle,
     2756                        'value' => $order->billing_ean_number
     2757                    ));
     2758                }
     2759                else{
     2760                    logthis('Billing EAN number is not updated, because it is empty or NULL');
     2761                }
    27382762            }
    27392763        }
    … …  
    27412765            if($order != NULL){
    27422766                logthis("woo_save_customer_meta_data_to_economic key: " . $meta_key . " value: " . $order->billing_vat_number);
    2743                 $client->Debtor_SetVatNumber(array(
    2744                     'debtorHandle' => $debtor_handle,
    2745                     'value' => $order->billing_vat_number
    2746                 ));
     2767                if($order->billing_vat_number != '' && $order->billing_vat_number != NULL){
     2768                    $client->Debtor_SetVatNumber(array(
     2769                        'debtorHandle' => $debtor_handle,
     2770                        'value' => $order->billing_vat_number
     2771                    ));
     2772                }
     2773                else{
     2774                    logthis('Billing VAT number is not updated, because it is empty or NULL');
     2775                }
    27472776            }
    27482777        }elseif($meta_key == 'billing_cin_number'){
    27492778            if($order != NULL){
    27502779                logthis("woo_save_customer_meta_data_to_economic key: " . $meta_key . " value: " . $order->billing_cin_number);
    2751                 $client->Debtor_SetCINumber(array(
    2752                     'debtorHandle' => $debtor_handle,
    2753                     'value' => $order->billing_cin_number
    2754                 ));
     2780                if($order->billing_cin_number != '' && $order->billing_cin_number != NULL){
     2781                    $client->Debtor_SetCINumber(array(
     2782                        'debtorHandle' => $debtor_handle,
     2783                        'value' => $order->billing_cin_number
     2784                    ));
     2785                }
     2786                else{
     2787                    logthis('Billing CIN number is not updated, because it is empty or NULL');
     2788                }
    27552789            }
    27562790        }else{

  • woocommerce-e-conomic-integration/trunk/readme.txt

    r1468483 r1473005  
    88Requires at least: 3.8
    99Tested up to:      4.5.3
    10 Stable tag:        1.9.20
    11 Version:           1.9.20
     10Stable tag:        1.9.21
     11Version:           1.9.21
    1212
    1313WooCommerce e-conomic integration synchronizes your WooCommerce Orders, Customers and Products to your e-conomic account.
    … …  
    124124== Changelog ==
    125125
     126= 1.9.21 =
     127* Improvements and Bug fixes.
     128
    126129= 1.9.20 =
    127130* Feature addition: Sync customer on user profile update.

  • woocommerce-e-conomic-integration/trunk/woocommerce-economic.php

    r1468483 r1473005  
    55 * Description: An e-conomic API Interface. Synchronizes products, orders, Customers and more to e-conomic.
    66 * Also fetches inventory from e-conomic and updates WooCommerce
    7  * Version: 1.9.20
     7 * Version: 1.9.21
    88 * Author: wooconomics
    99 * Text Domain: woocommerce-e-conomic-integration
    … …  
    13681368            //1.9.9.16 new feature
    13691369           
    1370             update_option('economic_version', 19.20);
     1370            update_option('economic_version', 19.21);
    13711371            update_option('woo_save_object_to_economic', true);
    13721372        }
    … …  
    14671467            }
    14681468
    1469             update_option('economic_version', 19.20);
     1469            update_option('economic_version', 19.21);
    14701470            update_option('woo_save_object_to_economic', true);
    14711471        }
    … …  
    19991999                add_settings_field( 'woocommerce-economic-activate-oldordersync', __('Activate old orders sync', 'woocommerce-e-conomic-integration'), array( &$this, 'field_option_checkbox' ), $this->general_settings_key, 'order_settings', array ( 'tab_key' => $this->general_settings_key, 'key' => 'activate-oldordersync', 'desc' => __('Also sync orders created before wooconomics installation.', 'woocommerce-e-conomic-integration')) );
    20002000               
    2001                 add_settings_field( 'woocommerce-economic-product-sync', __('Activate product sync', 'woocommerce-e-conomic-integration'), array( &$this, 'field_option_checkbox' ), $this->general_settings_key, 'product_settings', array ( 'tab_key' => $this->general_settings_key, 'key' => 'product-sync', 'desc' => __('Sync product information from WooCommerce to e-conomic. (Stock information is updated regardless of this setting)', 'woocommerce-e-conomic-integration')) );
     2001                add_settings_field( 'woocommerce-economic-product-sync', __('Activate product sync', 'woocommerce-e-conomic-integration'), array( &$this, 'field_option_checkbox' ), $this->general_settings_key, 'product_settings', array ( 'tab_key' => $this->general_settings_key, 'key' => 'product-sync', 'desc' => __('Sync product information from WooCommerce to e-conomic. Setting for disabling stock sync is below.', 'woocommerce-e-conomic-integration')) );
     2002               
     2003                add_settings_field( 'woocommerce-economic-product-stock-sync', __('Activate product stock sync', 'woocommerce-e-conomic-integration'), array( &$this, 'field_option_checkbox' ), $this->general_settings_key, 'product_settings', array ( 'tab_key' => $this->general_settings_key, 'key' => 'product-stock-sync', 'desc' => __('Sync product stock from e-conomic to WooCommerce', 'woocommerce-e-conomic-integration')) );
    20022004               
    20032005                add_settings_field( 'woocommerce-economic-scheduled-product-sync', __('Run scheduled product stock sync', 'woocommerce-e-conomic-integration'), array( &$this, 'field_option_schedule' ), $this->general_settings_key, 'product_settings', array ( 'tab_key' => $this->general_settings_key, 'key' => 'scheduled-product-sync', 'desc' => __('Run scheduled product stock sync from e-conomic to WooCommerce. Web hook option will update WooCommerce product when e-conomic product is updated.', 'woocommerce-e-conomic-integration')) );
Note: See TracChangeset for help on using the changeset viewer.