This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/addons/commerceml/src/Importers/ProductImporter.php b/app/addons/commerceml/src/Importers/ProductImporter.php | |
index 345cd76327..efc564f76e 100644 | |
--- a/app/addons/commerceml/src/Importers/ProductImporter.php | |
+++ b/app/addons/commerceml/src/Importers/ProductImporter.php | |
@@ -218,9 +218,16 @@ class ProductImporter | |
$current_pair_ids = []; | |
$detailed_image_data_list = []; | |
$pair_data_list = []; | |
+ $pair_position = 0; | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
define('AREA', 'A'); | |
define('ACCOUNT_TYPE', 'admin'); | |
require(dirname(__FILE__) . '/init.php'); | |
\Tygh\Registry::set('runtime.company_id', 0); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/payments/piraeus.php b/app/payments/piraeus.php | |
index 9de5aeb163..9d96d843dd 100644 | |
--- a/app/payments/piraeus.php | |
+++ b/app/payments/piraeus.php | |
@@ -28,8 +28,8 @@ if (defined('PAYMENT_NOTIFICATION')) { | |
$pp_response = []; | |
$pp_response['transaction_id'] = $_REQUEST['TransactionId']; | |
- $pp_response['transaction_datetime'] = $_REQUEST['TransactionDateTime']; | |
- $pp_response['reason_text'] = $_REQUEST['ResponseDescription']; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/addons/master_products/Tygh/Addons/MasterProducts/Product/Repository.php b/app/addons/master_products/Tygh/Addons/MasterProducts/Product/Repository.php | |
index 9288f4c9cf..4da84ddf3f 100644 | |
--- a/app/addons/master_products/Tygh/Addons/MasterProducts/Product/Repository.php | |
+++ b/app/addons/master_products/Tygh/Addons/MasterProducts/Product/Repository.php | |
@@ -155,7 +155,7 @@ class Repository | |
* | |
* @return int[] Vendor product IDs | |
*/ | |
- public function findVendorProductIds($master_product_id, array $status = null, array $company_status = null, $is_show_out_of_stock_products_enabled = false) | |
+ public function findVendorProductIds($master_product_id, array $status = null, array $company_status = null, $is_show_out_of_stock_products_enabled = true) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/controllers/frontend/checkout.php b/app/controllers/frontend/checkout.php | |
index cdfa5e4aba..ea0d3f2b02 100644 | |
--- a/app/controllers/frontend/checkout.php | |
+++ b/app/controllers/frontend/checkout.php | |
@@ -327,6 +327,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') { | |
} | |
fn_checkout_set_cart_profile_id($cart, $auth, $profile_id); | |
+ $cart['user_data'] = array_merge($cart['user_data'], $selectable_profiles[$profile_id]); | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/addons/suppliers/func.php b/app/addons/suppliers/func.php | |
index 492d84bd10..26ca94ff79 100644 | |
--- a/app/addons/suppliers/func.php | |
+++ b/app/addons/suppliers/func.php | |
@@ -1204,23 +1204,101 @@ function fn_suppliers_filter_objects_by_sharing( | |
$shared_type, | |
$shared_object_id | |
) { | |
- $shared_object_companies = fn_ult_get_object_shared_companies($shared_type, $shared_object_id); | |
- if (!$shared_object_companies) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/functions/fn.cms.php b/app/functions/fn.cms.php | |
index 0be84e15b2..1f47dc98f9 100644 | |
--- a/app/functions/fn.cms.php | |
+++ b/app/functions/fn.cms.php | |
@@ -211,7 +211,7 @@ function fn_get_pages($params = array(), $items_per_page = 0, $lang_code = CART_ | |
? (array) $params['company_id'] | |
: []; | |
- if ($storefront->getCompanyIds()) { | |
+ if (fn_allowed_for('MULTIVENDOR') && $storefront->getCompanyIds()) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/design/themes/responsive/templates/addons/warehouses/blocks/availability_in_stores.tpl b/design/themes/responsive/templates/addons/warehouses/blocks/availability_in_stores.tpl | |
index 4ac3686a46..e700bd51a1 100644 | |
--- a/design/themes/responsive/templates/addons/warehouses/blocks/availability_in_stores.tpl | |
+++ b/design/themes/responsive/templates/addons/warehouses/blocks/availability_in_stores.tpl | |
@@ -66,7 +66,7 @@ | |
{$store.pickup_phone} | |
</div> | |
<div class="ty-warehouses-store__availability"> | |
- {if $store.amount} | |
+ {if $store.amount && $store.amount > 0} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/functions/fn.users.php b/app/functions/fn.users.php | |
index 5790c3f749..0b1ee5151e 100644 | |
--- a/app/functions/fn.users.php | |
+++ b/app/functions/fn.users.php | |
@@ -1259,16 +1259,17 @@ function fn_get_users($params, &$auth, $items_per_page = 0, $custom_view = '') | |
]; | |
// Define sort fields | |
- $sortings = array( | |
- 'id' => '?:users.user_id', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/addons/rma/func.php b/app/addons/rma/func.php | |
index b72f699cb2..f0ee3cb824 100644 | |
--- a/app/addons/rma/func.php | |
+++ b/app/addons/rma/func.php | |
@@ -1194,3 +1194,30 @@ function fn_rma_get_returns($params, $items_per_page = 0, $lang_code = CART_LANG | |
return array($return_requests, $params); | |
} | |
+ | |
+/** |
NewerOlder