s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-24 13:40:29 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #86 from RETROTEC-AG/pr/#7_Shopify-interface-does-not-work

Browse Source 
shopify interface does not work
This commit is contained in:
OpenXE-ERP 2023-07-19 18:13:17 +02:00 committed by GitHub
commit 869c888947
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
upgrade/data/db_schema.json
View File

@ -99596,6 +99596,17 @@
"Extra": "",
"Privileges": "select,insert,update,references",
"Comment": ""
},
{
"Field": "getestet",
"Type": "int(11)",
"Collation": null,
"Null": "NO",
"Key": "",
"Default": "0",
"Extra": "",
"Privileges": "select,insert,update,references",
"Comment": ""
}
],
"keys": [

2
www/pages/shopexport.php
View File

@ -610,7 +610,7 @@ class Shopexport
'SELECT `id`
FROM `shopexport`
WHERE `aktiv` = 1 AND `autosendarticle` = 1 AND `artikelexport` = 1
AND (`autosendarticle_last` IS NULL OR DATE_ADD(`autosendarticle_last` INTERVAL %d MINUTE) <= NOW())',
AND (`autosendarticle_last` IS NULL OR DATE_ADD(`autosendarticle_last`, INTERVAL %d MINUTE) <= NOW())',
$minutes
)
);

26
www/pages/shopimporter_shopify.php
View File

@ -1,4 +1,4 @@
<?php
<?php
/*
**** COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
*
@ -10,8 +10,8 @@
* to obtain the text of the corresponding license version.
*
**** END OF COPYRIGHT & LICENSE NOTICE *** DO NOT REMOVE ****
*/
?>
*/
?>
<?php
use Xentral\Components\Http\JsonResponse;
@ -396,7 +396,7 @@ class Shopimporter_Shopify extends ShopimporterBase
$this->adapter->call("products/".$result['data']['product']['id']."/metafields.json", 'POST', array('metafield' => [
'key' => 'sync_status',
'value' => 1,
'value_type' => 'integer',
'type' => 'number_integer',
'namespace' => 'xentral',
]));
if($result['data']['product']['id'] == $nummer) {
@ -429,7 +429,7 @@ class Shopimporter_Shopify extends ShopimporterBase
$this->adapter->call("variants/".$resultv['variant']['id']."/metafields.json", 'POST', array('metafield' => [
'key' => 'sync_status',
'value' => 1,
'value_type' => 'integer',
'type' => 'number_integer',
'namespace' => 'xentral',
]));
$data['nummer'] = $resultv['data']['variant']['sku'];
@ -690,7 +690,7 @@ class Shopimporter_Shopify extends ShopimporterBase
$inventoryitemid = $resultv['data']['variant']['inventory_item_id'];
$resulti = $this->adapter->call("inventory_levels.json?inventory_item_ids=$inventoryitemid&location_ids=$locationid");
$vorhanden = $resulti['data']['inventory_levels'][0]['available'];
$adjust = $lageranzahl - $vorhanden;
$adjust = floatval($lageranzahl) - floatval($vorhanden);
if($adjust != 0){
$data = array("location_id" => $locationid,
"inventory_item_id"=> $inventoryitemid,
@ -1015,12 +1015,12 @@ class Shopimporter_Shopify extends ShopimporterBase
$dataproduct['product']['variants'][0]['metafields'] = array(array(
"key" => "harmonized_system_code",
"value"=> $zolltarifnummer,
"value_type"=> "string",
"type"=> "text",
"namespace"=> "global"),
[
'key' => 'sync_status',
'value' => 1,
'value_type' => 'integer',
'type' => 'number_integer',
'namespace' => 'xentral',
]);
if($pseudopreis != ''){
@ -1185,12 +1185,12 @@ class Shopimporter_Shopify extends ShopimporterBase
$veigenschaften[] = array(
"key" => "harmonized_system_code",
"value"=> $value['zolltarifnummer'],
"value_type"=> "string",
"type"=> "text",
"namespace"=> "global");
$veigenschaften[] = [
'key' => 'sync_status',
'value' => 1,
'value_type' => 'integer',
'type' => 'number_integer',
'namespace' => 'xentral',
];
@ -3334,7 +3334,7 @@ class Shopimporter_Shopify extends ShopimporterBase
$this->adapter->call('orders/' . $auftrag . '/metafields.json', 'POST', array('metafield' => [
'key' => 'sync_status',
'value' => 1,
'value_type' => 'integer',
'type' => 'number_integer',
'namespace' => 'xentral',
]));
return 'ok';
@ -3367,7 +3367,7 @@ class Shopimporter_Shopify extends ShopimporterBase
$this->adapter->call('orders/' . $auftrag . '/metafields.json', 'POST', array('metafield' => [
'key' => 'sync_status',
'value' => 3,
'value_type' => 'integer',
'type' => 'number_integer',
'namespace' => 'xentral',
]));
}
@ -3420,7 +3420,7 @@ class Shopimporter_Shopify extends ShopimporterBase
$this->adapter->call('orders/' . $auftrag . '/metafields.json', 'POST', array('metafield' => [
'key' => 'sync_status',
'value' => 2,
'value_type' => 'integer',
'type' => 'number_integer',
'namespace' => 'xentral',
]));
}else{