Skip to content

Commit 9f45193

Browse files
author
Leonix
committed
Shop-Script v.10.2.1
* Fixed a few visual bugs in the Webasyst 2 interface found after the update to version 10.2.
1 parent b66566a commit 9f45193

File tree

10 files changed

+21
-51
lines changed

10 files changed

+21
-51
lines changed

js/product/product.min.js

Lines changed: 8 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/product/product.min.js.map

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/product/stocks.js

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
if (this.options.lazy_loading && this.options.product_stocks.length > 0) {
2626
this.initLazyLoad(this.options.lazy_loading);
2727
}
28-
29-
this.initFixRetrespectiveTable(this.container.closest('.s-table-scrollable-x'));
3028
},
3129

3230
initLazyLoad: function(options) {
@@ -156,32 +154,6 @@
156154
},
157155
doneLoading: function () {
158156
this.waLoading.done();
159-
},
160-
161-
/**
162-
* fix WebKit browsers
163-
*/
164-
initFixRetrespectiveTable: function ($table_wrapper) {
165-
if(navigator.userAgent.indexOf('AppleWebKit') === -1) {
166-
return;
167-
}
168-
169-
$table_wrapper.css('perspective', '0');
170-
let timeout_id = null;
171-
const stopScrolling = () => {
172-
if (timeout_id) {
173-
clearTimeout(timeout_id);
174-
}
175-
176-
timeout_id = setTimeout(() => {
177-
$table_wrapper.css('perspective', '0');
178-
}, 50);
179-
};
180-
181-
$table_wrapper.on('scroll', function () {
182-
$table_wrapper.css('perspective', 'none');
183-
stopScrolling();
184-
});
185157
}
186158
};
187159
})(jQuery);

js/stocks_log.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
this.initLazyLoad(this.options.lazy_loading);
2020
}
2121

22-
$.product_stocks.initFixRetrespectiveTable(this.container.find('.table-scrollable-x'));
2322
},
2423

2524
initLazyLoad: function(options) {

lib/config/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
'pages' => true,
1414
'mobile' => true,
1515
'my_account' => true,
16-
'version' => '10.2.0',
16+
'version' => '10.2.1',
1717
'critical' => '10.2.0',
1818
'vendor' => 'webasyst',
1919
'csrf' => true,

templates/actions-legacy/order/Order.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ <h3><span class="gray">[`Payment`] —</span> <strong>{$params.payment_name}</st
208208
{/if}
209209

210210
<!-- order content -->
211-
{$visible_fulfilment_mode = !in_array($order.state_id, ['sent', 'completed', 'refunded', 'deleted'])}
211+
{$visible_fulfilment_mode = !in_array($order.state_id, ['shipped', 'completed', 'refunded', 'deleted'])}
212212
<table id="s-order-items" class="light s-order-items-table s-order-readable">
213213
{if $order.items}
214214
<tr>

templates/actions/order/Order.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ <h6 class="gray custom-mt-16">[`Payment link`]</h6>
280280
</div>
281281

282282
<!-- order content -->
283-
{$visible_fulfilment_mode = !in_array($order.state_id, ['sent', 'completed', 'refunded', 'deleted'])}
283+
{$visible_fulfilment_mode = !in_array($order.state_id, ['shipped', 'completed', 'refunded', 'deleted'])}
284284
<table id="s-order-items"
285285
class="s-order-items-table s-order-readable{if $visible_fulfilment_mode} s-order-items-table--fulfilmented-mode{/if}">
286286
{$_has_granted_calc_profit = $wa->user()->getRights('shop', 'reports')}

templates/actions/orders/Orders.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
{if empty($orders)}
4444
{if $view !== 'kanban'}
4545
{if $view == 'split'}
46-
<div class="sidebar blank width-adaptive-widest wide-mobile ahead-little overflow-visible" id="s-orders">
46+
<div class="sidebar blank width-adaptive-widest wide-mobile overflow-visible" id="s-orders">
4747
<div class="sidebar-header" style="position: sticky; top: 0; z-index: 1;"></div>
4848
<div class="sidebar-body">
4949
<div class="width-100 align-center custom-mt-32">
@@ -85,7 +85,7 @@
8585
{/if}
8686
{/if}
8787
{else}
88-
<div class="{if $view != 'table' && $view != 'kanban'}sidebar flexbox vertical blank width-adaptive-widest wide-mobile ahead-little{else}width-100{/if} overflow-visible" id="s-orders">
88+
<div class="{if $view != 'table' && $view != 'kanban'}sidebar flexbox vertical blank width-adaptive-widest wide-mobile {else}width-100{/if} overflow-visible" id="s-orders">
8989
{if $view == 'split'}
9090
<div class="sidebar-header"></div>
9191
{/if}

templates/actions/product/include.stocks_log.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@
132132
{/strip}{/function}
133133

134134
{if $log}
135-
<div class="table-scrollable-x s-rotate-x-180">
135+
<div class="table-scrollable-x hide-scrollbar">
136136
{if $stocks_count < 1}
137-
<table class="s-stocks-log bigdata single-lined s-rotate-x-180">
137+
<table class="s-stocks-log bigdata single-lined">
138138
<tr class="header white">
139139
<th class="min-width"></th>
140140
<th></th>
@@ -145,7 +145,7 @@
145145
{$log_list}
146146
</table>
147147
{else}
148-
<table class="s-stocks-log bigdata single-lined s-rotate-x-180">
148+
<table class="s-stocks-log bigdata single-lined">
149149
<tr class="header white">
150150
<th class="min-width"></th>
151151
<th></th>

0 commit comments

Comments
 (0)