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/buy_together/func.php b/app/addons/buy_together/func.php | |
index 70751b6..39b022c 100644 | |
--- a/app/addons/buy_together/func.php | |
+++ b/app/addons/buy_together/func.php | |
@@ -109,6 +109,8 @@ function fn_buy_together_get_chains($params = array(), $auth = array(), $lang_co | |
'descr.description', | |
); | |
+ fn_set_hook('buy_together_get_chains_pre', $fields, $params, $auth, $lang_code); | |
+ |
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.catalog.php b/app/functions/fn.catalog.php | |
* @param int $from_product_id Identifier of product from that options are copied | |
* @param int $to_product_id Identifier of product to that options are copied | |
* @param int/boolean $from_global_option_id Identifier of the global option or false (if options are copied from product) | |
- * @param array $v Product option data | |
+ * @param array $option_data Product option data | |
+ * @param array $change_options Links old options to the new ones via ids | |
+ * @param array $change_variant Links old variants to the new ones via ids | |
*/ | |
- fn_set_hook('clone_product_option_post', $from_product_id, $to_product_id, $from_global_option_id, $v); |
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.ultimate.php b/app/functions/fn.ultimate.php | |
index 51641da..f06ba6c 100644 | |
--- a/app/functions/fn.ultimate.php | |
+++ b/app/functions/fn.ultimate.php | |
@@ -2880,7 +2880,15 @@ function fn_ult_update_status_pre(&$status, &$status_data, &$type, &$lang_code, | |
function fn_ult_get_statuses_post(&$statuses, &$join, &$condition, &$type, &$status_to_select, &$additional_statuses, &$exclude_parent, &$lang_code, &$company_id) | |
{ | |
- $_company_id = $company_id ?: Registry::get('runtime.forced_company_id') ?: Registry::get('runtime.company_id'); | |
+ $_company_id = $company_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/Tygh/Shippings/Shippings.php b/app/Tygh/Shippings/Shippings.php | |
index 71fb87e..61dea7c 100644 | |
--- a/app/Tygh/Shippings/Shippings.php | |
+++ b/app/Tygh/Shippings/Shippings.php | |
@@ -181,7 +181,7 @@ class Shippings | |
} | |
} | |
- $package_info['W'] = !empty($package_info['W']) ? sprintf("%.2f", $package_info['W']) : '0.01'; | |
+ $package_info['W'] = !empty($package_info['W']) ? sprintf("%.3f", $package_info['W']) : '0.001'; |
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
! Xft settings --------------------------------------------------------------- | |
Xft.dpi: 96 | |
Xft.antialias: true | |
Xft.rgba: rgb | |
Xft.hinting: true | |
Xft.hintstyle: hintslight | |
! Rxvt-unicode ----------------------------------------------------------------- |
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
! Xft settings --------------------------------------------------------------- | |
Xft.dpi: 96 | |
Xft.antialias: true | |
Xft.rgba: rgb | |
Xft.hinting: true | |
Xft.hintstyle: hintslight | |
! Rxvt-unicode ----------------------------------------------------------------- |