Mikhail Shchekotov torunar
torunar
/ design-themes-responsive-templates-views-categories-view.tpl.diff
Created
February 16, 2016 11:15
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/views/categories/view.tpl b/design/themes/responsive/templates/views/categories/view.tpl | |
| index 92327b3..b269c8b 100644 | |
| --- a/design/themes/responsive/templates/views/categories/view.tpl | |
| +++ b/design/themes/responsive/templates/views/categories/view.tpl | |
| @@ -43,7 +43,7 @@ | |
| {/if} | |
| {if $layouts.$selected_layout.template} | |
| - {include file="`$layouts.$selected_layout.template`" columns=$product_columns} | |
| + {include file="`$layouts.$selected_layout.template`" columns=$product_columns no_sorting=true} |
torunar
/ design-themes-responsive-templates-views-categories-view.tpl.diff
Created
February 16, 2016 11:17
Disable sorting
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/views/categories/view.tpl b/design/themes/responsive/templates/views/categories/view.tpl | |
| index 92327b3..b269c8b 100644 | |
| --- a/design/themes/responsive/templates/views/categories/view.tpl | |
| +++ b/design/themes/responsive/templates/views/categories/view.tpl | |
| @@ -43,7 +43,7 @@ | |
| {/if} | |
| {if $layouts.$selected_layout.template} | |
| - {include file="`$layouts.$selected_layout.template`" columns=$product_columns} | |
| + {include file="`$layouts.$selected_layout.template`" columns=$product_columns no_sorting=true} |
torunar
/ app-Tygh-Themes-Styles.php.diff
Created
February 20, 2016 09:26
app-Tygh-Themes-Styles.php.diff
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/Themes/Styles.php b/app/Tygh/Themes/Styles.php | |
| index 747011d..ef8fe65 100644 | |
| --- a/app/Tygh/Themes/Styles.php | |
| +++ b/app/Tygh/Themes/Styles.php | |
| @@ -181,7 +181,7 @@ class Styles | |
| $less_var = Less::arrayToLessVars(array($var_name => $value)); | |
| if (preg_match('/@' . $var_name . ':.*?;/m', $less)) { | |
| - $less = preg_replace('/@' . $var_name . ':.*?;$/m', str_replace("\n", '', $less_var), $less); | |
| + $less = preg_replace('/(*ANYCRLF)@' . $var_name . ':.*?;$/m', str_replace("\n", '', $less_var), $less); |
torunar
/ app-controllers-frontend-checkout.php.diff
Last active
March 31, 2016 11:33
app-controllers-frontend-checkout.php.diff
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 7c2de06..94f91bb 100644 | |
| --- a/app/controllers/frontend/checkout.php | |
| +++ b/app/controllers/frontend/checkout.php | |
| @@ -137,11 +137,19 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') { | |
| fn_define('ESTIMATION', true); | |
| - $customer_location = empty($_REQUEST['customer_location']) ? array() : $_REQUEST['customer_location']; | |
| + $stored_cart = $cart; |
torunar
/ install-app-Installer-Setup.php.diff
Created
March 31, 2016 11:35
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/install/app/Installer/Setup.php b/install/app/Installer/Setup.php | |
| index 01fb6b5..2b96d26 100644 | |
| --- a/install/app/Installer/Setup.php | |
| +++ b/install/app/Installer/Setup.php | |
| @@ -405,13 +405,17 @@ class Setup | |
| */ | |
| private function _createAdminAccount($email, $password) | |
| { | |
| + $salt = fn_generate_salt(); | |
| + $password = fn_generate_salted_password($password, $salt); |
torunar
/ app-Tygh-Shippings-Services-Fedex.php.diff
Created
April 4, 2016 06:45
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/Services/Fedex.php b/app/Tygh/Shippings/Services/Fedex.php | |
| index 80df6a5..e5aa33e 100644 | |
| --- a/app/Tygh/Shippings/Services/Fedex.php | |
| +++ b/app/Tygh/Shippings/Services/Fedex.php | |
| @@ -47,10 +47,19 @@ class Fedex implements IService | |
| */ | |
| private function _prepareAddress($request, $address, $address_type_key, $code = '') | |
| { | |
| - $request[$address_type_key]['Address']['StreetLines'] = !empty($address['address']) ? $address['address'] : ''; | |
| + $default_fields = array( |
torunar
/ app-addons-blog-func.php.diff
Last active
April 13, 2016 08:00
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/blog/func.php b/app/addons/blog/func.php | |
| index bfcb028..bf897b5 100644 | |
| --- a/app/addons/blog/func.php | |
| +++ b/app/addons/blog/func.php | |
| @@ -95,19 +95,18 @@ function fn_blog_get_pages_pre(&$params, $items_per_page, $lang_code) | |
| $params['parent_id'] = $params['blog_page_id']; | |
| } | |
| } | |
| - if (!empty($params['page_type']) && $params['page_type'] == PAGE_TYPE_BLOG) { | |
| - $params['sort_by'] = 'timestamp'; |
torunar
/ app-Tygh-BlockManager-Location.php.diff
Created
May 4, 2016 11:38
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/BlockManager/Location.php b/app/Tygh/BlockManager/Location.php | |
| index 5ac7b3b..af573d7 100644 | |
| --- a/app/Tygh/BlockManager/Location.php | |
| +++ b/app/Tygh/BlockManager/Location.php | |
| @@ -24,6 +24,9 @@ class Location | |
| private static $_instance; | |
| private $_layout_id = 0; | |
| + /** @var array Locations cached by dispatch */ | |
| + private static $dispatch_cache; |
torunar
/ app-Tygh-BlockManager-Location.php.diff
Created
May 6, 2016 06:55
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/BlockManager/Location.php b/app/Tygh/BlockManager/Location.php | |
| index af573d7..a016b9c 100644 | |
| --- a/app/Tygh/BlockManager/Location.php | |
| +++ b/app/Tygh/BlockManager/Location.php | |
| @@ -126,7 +126,12 @@ class Location | |
| $cache_key = $dispatch; | |
| if (!empty($dynamic_object)) { | |
| - $cache_key .= "_{$dynamic_object['object_type']}_{$dynamic_object['object_id']}"; | |
| + $cache_key .= "_{$dynamic_object['object_type']}"; |
torunar
/ app-Tygh-BlockManager-Location.php.diff
Created
May 6, 2016 06:56
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/BlockManager/Location.php b/app/Tygh/BlockManager/Location.php | |
| index 5ac7b3b..a016b9c 100644 | |
| --- a/app/Tygh/BlockManager/Location.php | |
| +++ b/app/Tygh/BlockManager/Location.php | |
| @@ -24,6 +24,9 @@ class Location | |
| private static $_instance; | |
| private $_layout_id = 0; | |
| + /** @var array Locations cached by dispatch */ | |
| + private static $dispatch_cache; |