Skip to content

Commit 00d5e72

Browse files
author
Leonix
committed
wa-plugins/shipping/sd v.1.1.1
 * Fixed display of dates in the plugin settings. * Improved the plugin settings interface in the Webasyst 2 mode.
1 parent c041b10 commit 00d5e72

File tree

5 files changed

+59
-28
lines changed

5 files changed

+59
-28
lines changed

‎wa-plugins/shipping/sd/lib/config/plugin.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
'description' => 'Order pickup point available to customers from specified localities or region.',
55
'icon' => 'img/sd-16x16.png',
66
'logo' => 'img/sd-60x32.png',
7-
'version' => '1.1.0',
7+
'version' => '1.1.1',
88
'vendor' => 'webasyst',
99
'services_by_type' => true,
1010
'type' => 'pickup',

‎wa-plugins/shipping/sd/templates/include.settings_additional.html‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="field-group">
1+
<div class="field-group custom-m-0">
22
<div class="field">
33
<div class="name"></div>
44
<div class="value"><h3>{$obj->_w('Additional info')}</h3></div>
@@ -27,7 +27,19 @@
2727
{$obj->_w('Upload a photo')}
2828
</div>
2929
<div class="value">
30-
<input type="file" name="{$namespace}[photo]" class="js-upload-image">
30+
{if $wa->whichUI() === '1.3'}
31+
<input type="file" name="{$namespace}[photo]" class="js-upload-image">
32+
{else}
33+
<div id="file-upload">
34+
<div class="upload">
35+
<label class="link">
36+
<i class="fas fa-file-upload"></i>
37+
<span>[`Choose file`]</span>
38+
<input type="file" name="{$namespace}[photo]" class="js-upload-image">
39+
</label>
40+
</div>
41+
</div>
42+
{/if}
3143
</div>
3244
</div>
3345

@@ -44,8 +56,8 @@
4456
<img src="{$photo['uri']}">
4557
<input type="hidden" name="{$namespace}[photos][{$photo@iteration}][uri]" value="{$photo['uri']|escape}" class="js-sd-image-uri">
4658
</a>
47-
<a class="js-sd-image-delete" href="javascript:void(0);">
48-
<i class="icon16 delete"></i>{$obj->_w('remove')}
59+
<a class="js-sd-image-delete flexbox middle space-4 small" href="javascript:void(0);">
60+
<i class="icon16 delete fas fa-trash-alt fa-sm text-red custom-pt-4"></i>{$obj->_w('remove')}
4961
</a>
5062
</li>
5163
{/foreach}
@@ -61,8 +73,8 @@
6173
<img src="%s">
6274
<input type="hidden" name="{$namespace}[photos][]" value="%s">
6375
</a>
64-
<a class="js-sd-image-delete" href="javascript:void(0);">
65-
<i class="icon16 delete"></i>{$obj->_w('remove')}
76+
<a class="js-sd-image-delete flexbox middle space-4 small" href="javascript:void(0);">
77+
<i class="icon16 delete fas fa-trash-alt fa-sm text-red custom-pt-4"></i>{$obj->_w('remove')}
6678
</a>
6779
</li>
68-
{/capture}
80+
{/capture}

‎wa-plugins/shipping/sd/templates/include.settings_available_shipping.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{/foreach}
1818
</select>
1919
<br>
20-
<span class="errormsg js-sd-country-errormsg" style="display: none">{$obj->_w('Please select a country.')}</span>
20+
<span class="errormsg state-error-hint js-sd-country-errormsg" style="display: none">{$obj->_w('Please select a country.')}</span>
2121
</div>
2222
</div>
2323

@@ -50,7 +50,7 @@
5050
{$obj->_w('Localities')}
5151
</div>
5252
<div class="value">
53-
<input name="{$namespace}[city]" value="{$settings.city|default:''|escape}" type="text">
53+
<input class="long" name="{$namespace}[city]" value="{$settings.city|default:''|escape}" type="text">
5454

5555
<p class="hint">{$obj->_w('Separate localities with a comma')}</p>
5656
</div>
@@ -101,4 +101,4 @@
101101
<p class="hint">{$obj->_w('Use data provided by special plugins for comparison with common order dimensions. If no order dimensions data are available, the maximum length, width, and height values of order items are used.')}</p>
102102
</div>
103103
</div>
104-
</div>
104+
</div>

‎wa-plugins/shipping/sd/templates/include.settings_work_time.html‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<td>
44
<input type="text"
55
class="js-sd-date js-datepicker"
6-
value="{ifset($date, 'date', '')|wa_date|escape}"
6+
value="{wa_date('date', ifset($date, 'date', ''), 'server')|escape}"
77
name="{$namespace}[{$type}][{$iterator}][date]"
88
data-name="date"
99
placeholder="{waDateTime::format('date')}"
@@ -13,15 +13,15 @@
1313
<td>
1414
<input type="text"
1515
maxlength="64"
16-
class="js-sd-time-additional"
16+
class="js-sd-time-additional long"
1717
name="{$namespace}[{$type}][{$iterator}][additional]"
1818
value="{ifset($date, 'additional', '')|escape}"
1919
data-name="additional"
2020
>
2121
</td>
22-
<td>
22+
<td class="align-right">
2323
<a class="js-sd-delete-date" href="#" data-type="{$type}">
24-
<i class="icon16 no"></i>
24+
<i class="icon16 no fas fa-trash-alt text-red"></i>
2525
</a>
2626
</td>
2727
</tr>
@@ -32,7 +32,7 @@
3232
<td>
3333
<input type="text"
3434
class="js-sd-date js-datepicker"
35-
value="{ifset($date, 'date', '')|wa_date|escape}"
35+
value="{wa_date('date', ifset($date, 'date', ''), 'server')|escape}"
3636
name="{$namespace}[{$type}][{$iterator}][date]"
3737
data-name="date"
3838
placeholder="{waDateTime::format('date')}"
@@ -73,7 +73,7 @@
7373

7474
<td>
7575
<a class="js-sd-delete-date" href="#" data-type="{$type}">
76-
<i class="icon16 no"></i>
76+
<i class="icon16 no fas fa-trash-alt text-red"></i>
7777
</a>
7878
</td>
7979
</tr>
@@ -89,7 +89,7 @@
8989
<div class="field">
9090
<div class="name">{$obj->_w('Time zone')}</div>
9191
<div class="value">
92-
<select name="{$namespace}[timezone]">
92+
<select class="small" name="{$namespace}[timezone]">
9393
{foreach $timezones as $timezone => $cities}
9494
<option value="{$timezone}" {if $timezone == $settings.timezone|default:''|escape}selected{/if}>{$cities}</option>
9595
{/foreach}
@@ -161,8 +161,8 @@
161161
</div>
162162
<br>
163163
{*WORKDAYS*}
164-
<div class="field-group">
165-
<div class="field">
164+
<div class="field-group custom-p-0 custom-m-0">
165+
<div class="field vertical">
166166
<div class="name">
167167
{$obj->_w('Extra workdays')}
168168
</div>
@@ -179,7 +179,7 @@
179179
</thead>
180180
<tfoot>
181181
<tr class="white">
182-
<td><a class="inline-link js-sd-add-date" data-type="workdays"><i class="icon16 add"></i><b><i>{$obj->_w('Add date')}</i></b></a></td>
182+
<td><a class="inline-link sd-add-date js-sd-add-date" data-type="workdays"><i class="icon16 add fas fa-plus-circle text-green custom-mr-4"></i><b><i>{$obj->_w('Add date')}</i></b></a></td>
183183
</tr>
184184
</tfoot>
185185
<tbody>
@@ -196,8 +196,8 @@
196196
</div>
197197
<br>
198198
{*WEEKEND*}
199-
<div class="field-group">
200-
<div class="field">
199+
<div class="field-group custom-p-0 custom-m-0">
200+
<div class="field vertical">
201201
<div class="name">
202202
{$obj->_w('Extra days off')}
203203
</div>
@@ -212,7 +212,7 @@
212212
</thead>
213213
<tfoot>
214214
<tr class="white">
215-
<td><a class="inline-link js-sd-add-date" data-type="weekend"><i class="icon16 add"></i><b><i>{$obj->_w('Add date')}</i></b></a></td>
215+
<td><a class="inline-link sd-add-date js-sd-add-date" data-type="weekend"><i class="icon16 add fas fa-plus-circle text-green custom-mr-4"></i><b><i>{$obj->_w('Add date')}</i></b></a></td>
216216
<td>&nbsp;</td>
217217
</tr>
218218
</tfoot>
@@ -231,5 +231,5 @@
231231
</div>
232232

233233
{capture name="_error_date_html"}
234-
<p class="js-sd-error-date-msg errormsg">{$obj->_w('Invalid date')}</p>
235-
{/capture}
234+
<p class="js-sd-error-date-msg errormsg state-error-hint">{$obj->_w('Invalid date')}</p>
235+
{/capture}

‎wa-plugins/shipping/sd/templates/settings.html‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,26 @@
11
<script type="text/javascript" src="{$wa_url}wa-plugins/shipping/sd/js/settings.js?{$wa->version(true)}"></script>
22
<link rel="stylesheet" href="{$wa_url}wa-plugins/shipping/sd/css/sd.css?{$wa->version(true)}">
3+
<style>
4+
.is-wa2 .shipping-sd-settings { --font-size-small: 87.5%; --font-size-smaller: 75%; }
35

4-
<div id="js-shipping-sd-settings">
6+
.is-wa2 .shipping-sd-settings .field .value:not(:first-child) { display: block; }
7+
8+
.is-wa2 .shipping-sd-settings .sd-add-date *, .is-wa2 .sd-add-date * { font-style: normal; font-weight: normal; }
9+
10+
.is-wa2 .shipping-sd-settings table { font-size: var(--font-size-small); white-space: nowrap; }
11+
.is-wa2 .shipping-sd-settings table th { font-size: 100%; }
12+
.is-wa2 .shipping-sd-settings .white td { background: var(--background-color-blank) !important; }
13+
14+
.is-wa2 .shipping-sd-settings .input.shortest { width: 2.5em; }
15+
16+
@media screen and (max-width: 1390px) {
17+
.is-wa2 .shipping-sd-settings table { font-size: var(--font-size-smaller); }
18+
}
19+
</style>
20+
<script>
21+
$('.article:first').addClass('wide');
22+
</script>
23+
<div id="js-shipping-sd-settings" class="shipping-sd-settings">
524
{*BASIC SETTINGS*}
625
{include file='./include.settings_basic_settings.html' inline}
726

@@ -36,4 +55,4 @@
3655
}
3756
});
3857
})(jQuery);
39-
</script>
58+
</script>

0 commit comments

Comments
 (0)