Changeset 3148743
- Timestamp:
- 09/09/2024 01:51:33 PM (19 months ago)
- Location:
- eshoplogisticru/trunk
- Files:
-
- 3 edited
-
readme.txt (modified) (1 diff)
-
views/unloading-form.php (modified) (6 diffs)
-
wc-eshop-logistic.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
eshoplogisticru/trunk/readme.txt
r3143494 r3148743 4 4 Requires at least: 5.3 5 5 Tested up to: 5.8 6 Stable tag: 2.1.2 16 Stable tag: 2.1.22 7 7 License: GPLv2 8 8 License URI: http://www.gnu.org/licenses/gpl-2.0.html -
eshoplogisticru/trunk/views/unloading-form.php
r3137454 r3148743 26 26 $fulfillment = false; 27 27 if(isset($infoApi['services']['pochtalion'])){ 28 if($typeMethod['name'] == 'sdek' || $typeMethod['name'] == 'boxberry' || $typeMethod['name'] == 'postrf')29 $fulfillment = $infoApi['services']['pochtalion'];28 if($typeMethod['name'] == 'sdek' || $typeMethod['name'] == 'boxberry' || $typeMethod['name'] == 'postrf') 29 $fulfillment = $infoApi['services']['pochtalion']; 30 30 } 31 31 … … 75 75 76 76 <div class="form-box"> 77 <?php if($fulfillment): ?>77 <?php if($fulfillment): ?> 78 78 <div class="form-field checkbox-area"> 79 79 <label class="label" for="terminal-code">Выгружать заявки в фулфилмент «Почтальон»:</label> 80 80 <input class="form-value" name="fulfillment" type="checkbox"> 81 81 </div> 82 <?php endif; ?>82 <?php endif; ?> 83 83 84 84 <div class="form-field"> … … 137 137 $type = $explodeKey[1]; 138 138 $nameRu = $explodeKey[2] ?? $name; 139 $styleForm = '';140 141 if($type === 'checkbox')142 $styleForm = 'checkbox-area';139 $styleForm = ''; 140 141 if($type === 'checkbox') 142 $styleForm = 'checkbox-area'; 143 143 ?> 144 144 … … 149 149 value="<?php echo $value?>"> 150 150 <?php endif; ?> 151 <?php if ( $type === 'checkbox' ):152 $checked = '';153 if($value == true)154 $checked = 'checked';155 ?>151 <?php if ( $type === 'checkbox' ): 152 $checked = ''; 153 if($value == true) 154 $checked = 'checked'; 155 ?> 156 156 <input class="form-value" name="<?php echo $nameArr?>[<?php echo $name ?>]" type="checkbox" <?php echo $checked ?>> 157 <?php endif; ?>158 <?php if ( $type === 'date' ): ?>157 <?php endif; ?> 158 <?php if ( $type === 'date' ): ?> 159 159 <input class="form-value" name="<?php echo $nameArr?>[<?php echo $name ?>]" type="date" 160 160 value="<?php echo $value?>"> 161 <?php endif; ?>161 <?php endif; ?> 162 162 <?php if ( $type === 'select' ): ?> 163 163 <select name="<?php echo $nameArr?>[<?php echo $name ?>]" form="unloading_form" 164 164 class="form-value"> 165 165 <?php foreach ( $value as $k => $v ):?> 166 <?php if(is_array($v) && isset($v['text'])):?>166 <?php if(is_array($v) && isset($v['text'])):?> 167 167 <option value="<?php echo $k ?>" <?php echo ($v['selected'] == true)?'selected':'' ?>><?php echo $v['text'] ?></option> 168 <?php else: ?>168 <?php else: ?> 169 169 <option value="<?php echo $k ?>"><?php echo $v ?></option> 170 <?php endif; ?>170 <?php endif; ?> 171 171 <?php endforeach; ?> 172 172 </select> 173 173 <?php endif; ?> 174 174 </div> 175 <?php endforeach; ?>175 <?php endforeach; ?> 176 176 <?php endforeach; ?> 177 177 </div> … … 194 194 <label class="label" for="receiver-email">Электронная почта:</label> 195 195 <input class="form-value" name="receiver-email" type="text" 196 value=" ">196 value="<?php echo $address['email'] ?>"> 197 197 </div> 198 198 <div class="form-field"> … … 245 245 <label class="label">Способ доставки до терминала ТК:</label> 246 246 <select name="pick_up" form="unloading_form" class="form-value"> 247 <?php if($typeMethod['name'] != 'halva'): ?>248 <option value="0">Сами привезём на терминал транспортной компании</option>249 <?php endif; ?>247 <?php if($typeMethod['name'] != 'halva'): ?> 248 <option value="0">Сами привезём на терминал транспортной компании</option> 249 <?php endif; ?> 250 250 <option value="1">Груз заберёт транспортная компания</option> 251 251 </select> -
eshoplogisticru/trunk/wc-eshop-logistic.php
r3143494 r3148743 6 6 * 7 7 * @link https://wp.eshoplogistic.ru/ 8 * @since 2.1.2 18 * @since 2.1.22 9 9 * @package WC_Eshop_Logistic 10 10 * … … 13 13 * Plugin URI: https://wp.eshoplogistic.ru/ 14 14 * Description: Несколько служб доставки в одной интеграции: CDEK, DPD, Boxberry, IML, Почта России, Деловые Линии, ПЭК, Dostavista, GTD, Байкал Сервис и др. 15 * Version: 2.1.2 115 * Version: 2.1.22 16 16 * Author: eShopLogistic 17 17 * Author URI: https://eshoplogistic.ru/p747575 … … 41 41 define( 'WC_ESL_PLUGIN_DIR', plugin_dir_path(__FILE__) ); 42 42 43 define( 'WC_ESL_VERSION', '2.1.2 1' );43 define( 'WC_ESL_VERSION', '2.1.22' ); 44 44 45 45 define( 'WC_ESL_DOMAIN', 'wc-esl' );
Note: See TracChangeset
for help on using the changeset viewer.