Merged in APITOCART-18519-fix-order-bug (pull request #49)

APITOCART-18519-fix-order-bug [MASTER]

Approved-by: Oleg Syvak

Author: Taras Kubiv

src/app/Services/Api2Cart.php

@@ -665,7 +665,7 @@ public function getOrderInfo( $store_id=null, $order_id=null )
         try{
 
             $this->order->getConfig()->setApiKey('store_key', $store_id);
-            $result = $this->order->orderInfo( $order_id ,'force_all');
+            $result = $this->order->orderInfo( $order_id , null, 'force_all');
             $this->logApiCall( 'order.info.json', $result->getResult(), $result->getReturnCode(), $this->order->getConfig(), null, null, null, $result->getReturnMessage() ,['order_id'=>$order_id] );
 
             if ($result->getReturnCode() == 0) {
@@ -901,6 +901,7 @@ public function updateProduct($store_id=null, $product_id=null, $fields=[])
                 $result = $this->product->productUpdate(
                     $product_id,
                     null,
+                    null,
                     (isset($fields['price'])) ? $fields['price'] : null,
                     null,
                     null,
@@ -914,15 +915,14 @@ public function updateProduct($store_id=null, $product_id=null, $fields=[])
                     null,
                     null,
                     null,
-                    (isset($fields['name'])) ? $fields['name'] : null,
-                    null,
                     null,
+                    (isset($fields['name'])) ? $fields['name'] : null,
                     null,
                     null,
-                    (isset($fields['description'])) ? $fields['description'] : null,
                     null,
                     null,
                     null,
+                    (isset($fields['description'])) ? $fields['description'] : null,
                     null,
                     null,
                     null,
@@ -1190,19 +1190,12 @@ public function addProductImage($store_id=null, $product_id=null, $fields=[])
             $this->order->getConfig()->setApiKey('store_key', $store_id);
 
             if ($fields) {
-                $result = $this->product->productImageAdd(
-                    $product_id,
-                    $fields['image_name'],
-                    $fields['type'],
-                    $fields['url'],
-                    null,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null,
-                    null
-                );
+                $model = new \Api2Cart\Client\Model\ProductImageAdd();
+                $model->setProductId($product_id)
+                    ->setType($fields['type'] ?? 'base')
+                    ->setUrl($fields['url'])
+                    ->setImageName($fields['image_name'] ?? '');
+                $result = $this->product->productImageAdd($model);
 
                 $this->logApiCall( 'product.image.add.json', $result->getResult(), $result->getReturnCode(), $this->product->getConfig(), null, null, null, $result->getReturnMessage(), array_merge(['product_id'=>$product_id],$fields)  );
 

src/composer.json

@@ -9,7 +9,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.2.5",
-        "api2cart/api2cart-php-sdk": "dev-master",
+        "api2cart/api2cart-php-sdk": "2.1.1",
         "brotzka/laravel-dotenv-editor": "^2.1",
         "fideloper/proxy": "^4.2",
         "fruitcake/laravel-cors": "^1.0",

src/resources/views/business_cases/automatic_price_updating/index.blade.php

@@ -362,7 +362,9 @@ function(data, type, row, meta){
                                     //update log count
                                     if ( presponse.data.log ){
                                         for (let k=0; k<presponse.data.log.length; k++){
-                                            logItems.push( presponse.data.log[k] );
+                                            if (k < 2) {//skip product.info
+                                                logItems.push(presponse.data.log[k]);
+                                            }
                                         }
                                         calculateLog();
                                     }
@@ -386,7 +388,7 @@ function(data, type, row, meta){
                                 }).catch(function (error) {
                                     $.unblockUI();
 
-                                    if ( typeof error.response.data.errors != 'undefined'){
+                                    if ( typeof error.response != 'undefined' && typeof error.response.data.errors != 'undefined'){
                                         var err_msg = '<ul>';
                                         $.each(error.response.data.errors, function(index, value) {
                                             let obj = document.getElementById( index ); // $('#'+index)