Changeset 3257576
- Timestamp:
- 03/18/2025 08:29:13 AM (10 months ago)
- Location:
- morkva-ua-shipping
- Files:
-
- 191 added
- 6 edited
-
tags/1.2.2 (added)
-
tags/1.2.2/README.md (added)
-
tags/1.2.2/README.txt (added)
-
tags/1.2.2/assets (added)
-
tags/1.2.2/assets/css (added)
-
tags/1.2.2/assets/css/admin (added)
-
tags/1.2.2/assets/css/admin/admin-mrkv-ua-shipping.css (added)
-
tags/1.2.2/assets/css/front (added)
-
tags/1.2.2/assets/css/front/front-mrkv-ua-shipping.css (added)
-
tags/1.2.2/assets/css/global (added)
-
tags/1.2.2/assets/css/global/global-mrkv-ua-shipping.css (added)
-
tags/1.2.2/assets/css/global/select2.min.css (added)
-
tags/1.2.2/assets/images (added)
-
tags/1.2.2/assets/images/global (added)
-
tags/1.2.2/assets/images/global/add-square-icon.svg (added)
-
tags/1.2.2/assets/images/global/alarm-icon.svg (added)
-
tags/1.2.2/assets/images/global/automation-icon.svg (added)
-
tags/1.2.2/assets/images/global/box-icon.svg (added)
-
tags/1.2.2/assets/images/global/chart-icon.svg (added)
-
tags/1.2.2/assets/images/global/circle-plus-icon.svg (added)
-
tags/1.2.2/assets/images/global/clapperboard-edit-icon.svg (added)
-
tags/1.2.2/assets/images/global/clipboard-list-icon.svg (added)
-
tags/1.2.2/assets/images/global/close-icon.svg (added)
-
tags/1.2.2/assets/images/global/delivery-icon.svg (added)
-
tags/1.2.2/assets/images/global/document-icon.svg (added)
-
tags/1.2.2/assets/images/global/external-link.svg (added)
-
tags/1.2.2/assets/images/global/home-icon.svg (added)
-
tags/1.2.2/assets/images/global/info-icon.svg (added)
-
tags/1.2.2/assets/images/global/invoices-icon.svg (added)
-
tags/1.2.2/assets/images/global/letter-icon.svg (added)
-
tags/1.2.2/assets/images/global/library-icon.svg (added)
-
tags/1.2.2/assets/images/global/magnifer-icon.svg (added)
-
tags/1.2.2/assets/images/global/map-icon.svg (added)
-
tags/1.2.2/assets/images/global/mention-square-icon.svg (added)
-
tags/1.2.2/assets/images/global/morkva-icon-20x20.svg (added)
-
tags/1.2.2/assets/images/global/morkva-logo.svg (added)
-
tags/1.2.2/assets/images/global/notice-success.svg (added)
-
tags/1.2.2/assets/images/global/printer-icon.svg (added)
-
tags/1.2.2/assets/images/global/question-icon.svg (added)
-
tags/1.2.2/assets/images/global/routing-icon.svg (added)
-
tags/1.2.2/assets/images/global/settings-icon.svg (added)
-
tags/1.2.2/assets/images/global/sticker-icon.svg (added)
-
tags/1.2.2/assets/images/global/telegram-logo.svg (added)
-
tags/1.2.2/assets/images/global/trash-icon.svg (added)
-
tags/1.2.2/assets/images/global/tuning-icon.svg (added)
-
tags/1.2.2/assets/images/global/ui-anim.basic.16x16.gif (added)
-
tags/1.2.2/assets/images/global/user-icon.svg (added)
-
tags/1.2.2/assets/images/global/wallet-icon.svg (added)
-
tags/1.2.2/assets/images/nova-poshta (added)
-
tags/1.2.2/assets/images/nova-poshta/logo-mini.png (added)
-
tags/1.2.2/assets/images/nova-poshta/logo-settings.svg (added)
-
tags/1.2.2/assets/images/rozetka-delivery (added)
-
tags/1.2.2/assets/images/rozetka-delivery/logo-mini.png (added)
-
tags/1.2.2/assets/images/rozetka-delivery/logo-settings.svg (added)
-
tags/1.2.2/assets/images/ukr-poshta (added)
-
tags/1.2.2/assets/images/ukr-poshta/logo-mini.png (added)
-
tags/1.2.2/assets/images/ukr-poshta/logo-settings.svg (added)
-
tags/1.2.2/assets/js (added)
-
tags/1.2.2/assets/js/admin (added)
-
tags/1.2.2/assets/js/admin/admin-mrkv-ua-shipping-nova-poshta.js (added)
-
tags/1.2.2/assets/js/admin/admin-mrkv-ua-shipping-rozetka-delivery.js (added)
-
tags/1.2.2/assets/js/admin/admin-mrkv-ua-shipping-ukr-poshta.js (added)
-
tags/1.2.2/assets/js/admin/admin-mrkv-ua-shipping.js (added)
-
tags/1.2.2/assets/js/front (added)
-
tags/1.2.2/assets/js/front/front-mrkv-ua-shipping-nova-poshta.js (added)
-
tags/1.2.2/assets/js/front/front-mrkv-ua-shipping-rozetka-delivery.js (added)
-
tags/1.2.2/assets/js/front/front-mrkv-ua-shipping-ukr-poshta.js (added)
-
tags/1.2.2/assets/js/front/front-mrkv-ua-shipping.js (added)
-
tags/1.2.2/assets/js/global (added)
-
tags/1.2.2/assets/js/global/global-mrkv-ua-shipping-nova-poshta.js (added)
-
tags/1.2.2/assets/js/global/global-mrkv-ua-shipping-rozetka-delivery.js (added)
-
tags/1.2.2/assets/js/global/global-mrkv-ua-shipping-ukr-poshta.js (added)
-
tags/1.2.2/assets/js/global/global-mrkv-ua-shipping.js (added)
-
tags/1.2.2/assets/js/global/select2.min.js (added)
-
tags/1.2.2/classes (added)
-
tags/1.2.2/classes/mrkv-ua-shipping-run.php (added)
-
tags/1.2.2/classes/settings (added)
-
tags/1.2.2/classes/settings/admin (added)
-
tags/1.2.2/classes/settings/admin/mrkv-ua-shipping-admin-assets.php (added)
-
tags/1.2.2/classes/settings/admin/mrkv-ua-shipping-menu.php (added)
-
tags/1.2.2/classes/settings/admin/mrkv-ua-shipping-notification.php (added)
-
tags/1.2.2/classes/settings/global (added)
-
tags/1.2.2/classes/settings/global/mrkv-ua-shipping-option-fields.php (added)
-
tags/1.2.2/classes/settings/global/mrkv-ua-shipping-options.php (added)
-
tags/1.2.2/classes/settings/log (added)
-
tags/1.2.2/classes/settings/log/mrkv-ua-shipping-log.php (added)
-
tags/1.2.2/classes/settings/mrkv-ua-shipping-settings.php (added)
-
tags/1.2.2/classes/shipping_methods (added)
-
tags/1.2.2/classes/shipping_methods/mrkv-ua-shipping-methods-ajax.php (added)
-
tags/1.2.2/classes/shipping_methods/mrkv-ua-shipping-methods-checkout-validation.php (added)
-
tags/1.2.2/classes/shipping_methods/mrkv-ua-shipping-methods-checkout.php (added)
-
tags/1.2.2/classes/shipping_methods/mrkv-ua-shipping-methods-order.php (added)
-
tags/1.2.2/classes/shipping_methods/mrkv-ua-shipping-methods.php (added)
-
tags/1.2.2/classes/shipping_methods/mrkv_ua_shipping_translate.php (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/ajax (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/ajax/mrkv-ua-shipping-methods-ajax-nova.php (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/api (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/api/mrkv-ua-shipping-api-nova-poshta.php (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/api/mrkv-ua-shipping-calculate-nova-poshta.php (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/api/mrkv-ua-shipping-recipient-nova-poshta.php (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/api/mrkv-ua-shipping-sender-nova-poshta.php (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/checkout (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/checkout/mrkv-ua-shipping-checkout.php (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/invoice (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/invoice/mrkv-ua-shipping-nova-poshta-invoice.php (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/settings (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/settings/mrkv-ua-shipping-settings-nova-poshta.php (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/woocommerce (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/woocommerce/mrkv-ua-shipping-method-nova-poshta-address.php (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/woocommerce/mrkv-ua-shipping-method-nova-poshta-poshtamat.php (added)
-
tags/1.2.2/classes/shipping_methods/nova-poshta/woocommerce/mrkv-ua-shipping-method-nova-poshta.php (added)
-
tags/1.2.2/classes/shipping_methods/rozetka-delivery (added)
-
tags/1.2.2/classes/shipping_methods/rozetka-delivery/ajax (added)
-
tags/1.2.2/classes/shipping_methods/rozetka-delivery/ajax/mrkv-ua-shipping-methods-ajax-rozetka.php (added)
-
tags/1.2.2/classes/shipping_methods/rozetka-delivery/api (added)
-
tags/1.2.2/classes/shipping_methods/rozetka-delivery/api/mrkv-ua-shipping-api-rozetka-delivery.php (added)
-
tags/1.2.2/classes/shipping_methods/rozetka-delivery/checkout (added)
-
tags/1.2.2/classes/shipping_methods/rozetka-delivery/checkout/mrkv-ua-shipping-checkout.php (added)
-
tags/1.2.2/classes/shipping_methods/rozetka-delivery/settings (added)
-
tags/1.2.2/classes/shipping_methods/rozetka-delivery/settings/mrkv-ua-shipping-settings-rozetka-delivery.php (added)
-
tags/1.2.2/classes/shipping_methods/rozetka-delivery/woocommerce (added)
-
tags/1.2.2/classes/shipping_methods/rozetka-delivery/woocommerce/mrkv-ua-shipping-method-rozetka-delivery.php (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta/ajax (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta/ajax/mrkv-ua-shipping-methods-ajax-ukr.php (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta/api (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta/api/mrkv-ua-shipping-api-ukr-poshta.php (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta/api/mrkv-ua-shipping-calculate-ukr-poshta.php (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta/checkout (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta/checkout/mrkv-ua-shipping-checkout.php (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta/invoice (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta/invoice/mrkv-ua-shipping-ukr-poshta-invoice.php (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta/settings (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta/settings/mrkv-ua-shipping-settings-ukr-poshta.php (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta/woocommerce (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta/woocommerce/mrkv-ua-shipping-method-ukr-poshta-address.php (added)
-
tags/1.2.2/classes/shipping_methods/ukr-poshta/woocommerce/mrkv-ua-shipping-method-ukr-poshta.php (added)
-
tags/1.2.2/classes/woocommerce (added)
-
tags/1.2.2/classes/woocommerce/mrkv-ua-shipping-woo-order.php (added)
-
tags/1.2.2/classes/woocommerce/mrkv-ua-shipping-woo-orders.php (added)
-
tags/1.2.2/classes/woocommerce/mrkv-ua-shipping-woocommerce.php (added)
-
tags/1.2.2/constants-mrkv-ua-shipping.php (added)
-
tags/1.2.2/i18n (added)
-
tags/1.2.2/i18n/mrkv-ua-shipping-en_GB.l10n.php (added)
-
tags/1.2.2/i18n/mrkv-ua-shipping-en_GB.mo (added)
-
tags/1.2.2/i18n/mrkv-ua-shipping-en_GB.po (added)
-
tags/1.2.2/i18n/mrkv-ua-shipping-en_US.l10n.php (added)
-
tags/1.2.2/i18n/mrkv-ua-shipping-en_US.mo (added)
-
tags/1.2.2/i18n/mrkv-ua-shipping-en_US.po (added)
-
tags/1.2.2/i18n/mrkv-ua-shipping-ru_RU.l10n.php (added)
-
tags/1.2.2/i18n/mrkv-ua-shipping-ru_RU.mo (added)
-
tags/1.2.2/i18n/mrkv-ua-shipping-ru_RU.po (added)
-
tags/1.2.2/i18n/mrkv-ua-shipping-uk.l10n.php (added)
-
tags/1.2.2/i18n/mrkv-ua-shipping-uk.mo (added)
-
tags/1.2.2/i18n/mrkv-ua-shipping-uk.po (added)
-
tags/1.2.2/i18n/mrkv-ua-shipping.pot (added)
-
tags/1.2.2/logs (added)
-
tags/1.2.2/logs/nova-poshta (added)
-
tags/1.2.2/logs/nova-poshta/debug-nova-poshta.log (added)
-
tags/1.2.2/logs/rozetka-delivery (added)
-
tags/1.2.2/logs/rozetka-delivery/debug-rozetka-delivery.log (added)
-
tags/1.2.2/logs/ukr-poshta (added)
-
tags/1.2.2/logs/ukr-poshta/debug-ukr-poshta.log (added)
-
tags/1.2.2/mrkv-ua-shipping.php (added)
-
tags/1.2.2/templates (added)
-
tags/1.2.2/templates/elements (added)
-
tags/1.2.2/templates/elements/template-mrkv-ua-shipping-header.php (added)
-
tags/1.2.2/templates/elements/template-mrkv-ua-shipping-links.php (added)
-
tags/1.2.2/templates/elements/template-mrkv-ua-shipping-support.php (added)
-
tags/1.2.2/templates/elements/template-mrkv-ua-shipping-tabs.php (added)
-
tags/1.2.2/templates/orders (added)
-
tags/1.2.2/templates/orders/mrkv-ua-ship-popup-nova-poshta.php (added)
-
tags/1.2.2/templates/orders/mrkv-ua-ship-popup-ukr-poshta.php (added)
-
tags/1.2.2/templates/orders/mrkv-ua-ship-popup.php (added)
-
tags/1.2.2/templates/orders/mrkv-ua-ship-ukr-poshta-multipdf.php (added)
-
tags/1.2.2/templates/orders/mrkv-ua-ship-ukr-poshta-pdf.php (added)
-
tags/1.2.2/templates/settings (added)
-
tags/1.2.2/templates/settings/methods (added)
-
tags/1.2.2/templates/settings/methods/invoices (added)
-
tags/1.2.2/templates/settings/methods/invoices/mrkv-ua-shipping-nova-poshta.php (added)
-
tags/1.2.2/templates/settings/methods/invoices/mrkv-ua-shipping-sidebar.php (added)
-
tags/1.2.2/templates/settings/methods/invoices/mrkv-ua-shipping-ukr-poshta.php (added)
-
tags/1.2.2/templates/settings/methods/shipping_fields (added)
-
tags/1.2.2/templates/settings/methods/shipping_fields/mrkv-ua-shipping-nova-poshta.php (added)
-
tags/1.2.2/templates/settings/methods/shipping_fields/mrkv-ua-shipping-rozetka-delivery.php (added)
-
tags/1.2.2/templates/settings/methods/shipping_fields/mrkv-ua-shipping-ukr-poshta.php (added)
-
tags/1.2.2/templates/settings/methods/template-mrkv-ua-shipping-global.php (added)
-
tags/1.2.2/templates/settings/methods/template-mrkv-ua-shipping-pages-global.php (added)
-
tags/1.2.2/templates/settings/template-mrkv-ua-shipping-about-us.php (added)
-
tags/1.2.2/templates/settings/template-mrkv-ua-shipping-settings.php (added)
-
trunk/README.txt (modified) (2 diffs)
-
trunk/assets/js/front/front-mrkv-ua-shipping.js (modified) (1 diff)
-
trunk/classes/shipping_methods/ukr-poshta/invoice/mrkv-ua-shipping-ukr-poshta-invoice.php (modified) (2 diffs)
-
trunk/mrkv-ua-shipping.php (modified) (1 diff)
-
trunk/templates/orders/mrkv-ua-ship-popup-ukr-poshta.php (modified) (2 diffs)
-
trunk/templates/settings/methods/shipping_fields/mrkv-ua-shipping-ukr-poshta.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
morkva-ua-shipping/trunk/README.txt
r3256947 r3257576 5 5 Tested up to: 6.7 6 6 Requires PHP: 7.0 7 Stable tag: 1.2. 17 Stable tag: 1.2.2 8 8 License: GPLv2 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 160 160 == Changelog == 161 161 162 = 1.2.2 = 163 * [dev] прибрали помилково додану можливість створення ТТН від імені юридичних осіб 164 162 165 = 1.2.1 = 163 166 * [fix] виправили завантаження полів НП -
morkva-ua-shipping/trunk/assets/js/front/front-mrkv-ua-shipping.js
r3255478 r3257576 3 3 if (jQuery('form[name="checkout"]').length == 0) return; 4 4 5 let mrkv_ua_current_shipping = mrkvUaShipGetCurrentShipping(); 5 setTimeout(function(){ 6 let mrkv_ua_current_shipping = mrkvUaShipGetCurrentShipping(); 6 7 7 if(mrkv_ua_current_shipping && ~mrkv_ua_current_shipping.indexOf("mrkv_ua_shipping")) 8 { 9 mrkvUaShipDisableDefaultFieldsforup(); 10 mrkvUaShipShowGroup(mrkv_ua_current_shipping); 11 } 12 else 13 { 14 mrkvUaShipEnableDefaultFieldsforup(); 15 mrkvUaShipHideAllGroups(); 16 } 8 if(mrkv_ua_current_shipping && ~mrkv_ua_current_shipping.indexOf("mrkv_ua_shipping")) 9 { 10 mrkvUaShipDisableDefaultFieldsforup(); 11 mrkvUaShipShowGroup(mrkv_ua_current_shipping); 12 } 13 else 14 { 15 mrkvUaShipEnableDefaultFieldsforup(); 16 mrkvUaShipHideAllGroups(); 17 } 18 }, 200); 17 19 18 20 jQuery( document.body ).on( 'updated_checkout', () => { -
morkva-ua-shipping/trunk/classes/shipping_methods/ukr-poshta/invoice/mrkv-ua-shipping-ukr-poshta-invoice.php
r3255478 r3257576 192 192 } 193 193 } 194 elseif($sender_type == 'COMPANY') 195 { 196 if(isset($this->settings_shipping['sender']['company']['name']) && $this->settings_shipping['sender']['company']['name']){ 197 $sender_first_name = $this->settings_shipping['sender']['company']['name']; 198 } 199 if(isset($this->settings_shipping['sender']['company']['lastname']) && $this->settings_shipping['sender']['company']['lastname']){ 200 $sender_last_name = $this->settings_shipping['sender']['company']['lastname']; 201 } 202 if(isset($this->settings_shipping['sender']['company']['middlename']) && $this->settings_shipping['sender']['company']['middlename']){ 203 $sender_middle_name = $this->settings_shipping['sender']['company']['middlename']; 204 } 205 if(isset($this->settings_shipping['sender']['company']['phone']) && $this->settings_shipping['sender']['company']['phone']){ 206 $sender_phone = $this->settings_shipping['sender']['company']['phone']; 207 } 208 if(isset($this->settings_shipping['sender']['company']['name_main']) && $this->settings_shipping['sender']['company']['name_main']){ 209 $sender_name = $this->settings_shipping['sender']['company']['name_main']; 210 } 211 if(isset($this->settings_shipping['sender']['company']['edrpou']) && $this->settings_shipping['sender']['company']['edrpou']){ 212 $sender_edprou = $this->settings_shipping['sender']['company']['edrpou']; 213 } 214 if(isset($this->settings_shipping['sender']['company']['iban']) && $this->settings_shipping['sender']['company']['iban']){ 215 $sender_bank = $this->settings_shipping['sender']['company']['iban']; 216 } 217 } 218 elseif($sender_type == 'PRIVATE_ENTREPRENEUR') 219 { 220 if(isset($this->settings_shipping['sender']['private']['name']) && $this->settings_shipping['sender']['private']['name']){ 221 $sender_first_name = $this->settings_shipping['sender']['private']['name']; 222 } 223 if(isset($this->settings_shipping['sender']['private']['lastname']) && $this->settings_shipping['sender']['private']['lastname']){ 224 $sender_last_name = $this->settings_shipping['sender']['private']['lastname']; 225 } 226 if(isset($this->settings_shipping['sender']['private']['middlename']) && $this->settings_shipping['sender']['private']['middlename']){ 227 $sender_middle_name = $this->settings_shipping['sender']['private']['middlename']; 228 } 229 if(isset($this->settings_shipping['sender']['private']['phone']) && $this->settings_shipping['sender']['private']['phone']){ 230 $sender_phone = $this->settings_shipping['sender']['private']['phone']; 231 } 232 if(isset($this->settings_shipping['sender']['private']['name_main']) && $this->settings_shipping['sender']['private']['name_main']){ 233 $sender_name = $this->settings_shipping['sender']['private']['name_main']; 234 } 235 if(isset($this->settings_shipping['sender']['private']['iban']) && $this->settings_shipping['sender']['private']['iban']){ 236 $sender_bank = $this->settings_shipping['sender']['private']['iban']; 237 } 238 if(isset($this->settings_shipping['sender']['private']['ipn']) && $this->settings_shipping['sender']['private']['ipn']){ 239 $sender_tin = $this->settings_shipping['sender']['private']['ipn']; 194 else 195 { 196 $sender_type = 'INDIVIDUAL'; 197 $sender_last_name = (isset($this->settings_shipping['sender']['company']['lastname']) && $this->settings_shipping['sender']['company']['lastname']) ? $this->settings_shipping['sender']['company']['lastname'] : $sender_last_name; 198 199 if(!$sender_last_name){ 200 $sender_last_name = (isset($this->settings_shipping['sender']['private']['lastname']) && $this->settings_shipping['sender']['private']['lastname']) ? $this->settings_shipping['sender']['private']['lastname'] : $sender_last_name; 201 } 202 203 $sender_first_name = (isset($this->settings_shipping['sender']['company']['name']) && $this->settings_shipping['sender']['company']['name']) ? $this->settings_shipping['sender']['company']['name'] : $sender_first_name; 204 205 if(!$sender_first_name) 206 { 207 $sender_first_name = (isset($this->settings_shipping['sender']['private']['name']) && $this->settings_shipping['sender']['private']['name']) ? $this->settings_shipping['sender']['private']['name'] : $sender_first_name; 208 } 209 210 $sender_middle_name = (isset($this->settings_shipping['sender']['private']['middlename']) && $this->settings_shipping['sender']['private']['middlename']) ? $this->settings_shipping['sender']['private']['middlename'] : $sender_middle_name; 211 212 $sender_phone = (isset($this->settings_shipping['sender']['company']['phone']) && $this->settings_shipping['sender']['company']['phone']) ? $this->settings_shipping['sender']['company']['phone'] : $sender_phone; 213 214 if(!$sender_phone) 215 { 216 $sender_phone = (isset($this->settings_shipping['sender']['private']['phone']) && $this->settings_shipping['sender']['private']['phone']) ? $this->settings_shipping['sender']['private']['phone'] : $sender_phone; 240 217 } 241 218 } … … 708 685 $sender_type = (isset($this->settings_shipping['sender']['type']) && $this->settings_shipping['sender']['type']) ? $this->settings_shipping['sender']['type'] : ''; 709 686 710 if($declared_price && $this->order->get_payment_method() == 'cod')711 {712 if('COMPANY' == $sender_type && isset($this->settings_shipping['sender']['company']['postpay'])713 && $this->settings_shipping['sender']['company']['postpay'] == 'on')714 {715 return true;716 }717 elseif('PRIVATE_ENTREPRENEUR' == $sender_type && isset($this->settings_shipping['sender']['private']['postpay'])718 && $this->settings_shipping['sender']['private']['postpay'] == 'on')719 {720 return true;721 }722 }723 724 687 if($post_pay && $post_pay > 0) 725 688 { -
morkva-ua-shipping/trunk/mrkv-ua-shipping.php
r3256947 r3257576 4 4 * Plugin URI: https://morkva.co.ua/product-category/plugins/ 5 5 * Description: 2-in-1: Nova Poshta and Ukrposhta delivery services. Create shipping methods and shipments easily 6 * Version: 1.2. 16 * Version: 1.2.2 7 7 * Author: MORKVA 8 8 * Text Domain: mrkv-ua-shipping -
morkva-ua-shipping/trunk/templates/orders/mrkv-ua-ship-popup-ukr-poshta.php
r3222771 r3257576 25 25 $name = isset($mrk_ua_ship_ukr_settings['sender']['individual']['name']) ? $mrk_ua_ship_ukr_settings['sender']['individual']['name'] . ' ' : ''; 26 26 $middlename = isset($mrk_ua_ship_ukr_settings['sender']['individual']['middlename']) ? $mrk_ua_ship_ukr_settings['sender']['individual']['middlename'] . ' ' : ''; 27 $companyname = isset($mrk_ua_ship_ukr_settings['sender']['individual']['name_main']) ? $mrk_ua_ship_ukr_settings['sender']['individual']['name_main'] . ' ' : '';28 27 $phone = isset($mrk_ua_ship_ukr_settings['sender']['individual']['phone']) ? $mrk_ua_ship_ukr_settings['sender']['individual']['phone'] . ' ' : ''; 29 28 } 30 elseif($sender_type == 'COMPANY'){ 31 $lastname = isset($mrk_ua_ship_ukr_settings['sender']['company']['lastname']) ? $mrk_ua_ship_ukr_settings['sender']['company']['lastname'] . ' ' : ''; 32 $name = isset($mrk_ua_ship_ukr_settings['sender']['company']['name']) ? $mrk_ua_ship_ukr_settings['sender']['company']['name'] . ' ' : ''; 33 $middlename = isset($mrk_ua_ship_ukr_settings['sender']['company']['middlename']) ? $mrk_ua_ship_ukr_settings['sender']['company']['middlename'] . ' ' : ''; 34 $companyname = isset($mrk_ua_ship_ukr_settings['sender']['company']['name_main']) ? $mrk_ua_ship_ukr_settings['sender']['company']['name_main'] . ' ' : ''; 35 $phone = isset($mrk_ua_ship_ukr_settings['sender']['company']['phone']) ? $mrk_ua_ship_ukr_settings['sender']['company']['phone'] . ' ' : ''; 36 } 37 elseif($sender_type == 'PRIVATE_ENTREPRENEUR'){ 38 $lastname = isset($mrk_ua_ship_ukr_settings['sender']['private']['lastname']) ? $mrk_ua_ship_ukr_settings['sender']['private']['lastname'] . ' ' : ''; 39 $name = isset($mrk_ua_ship_ukr_settings['sender']['private']['name']) ? $mrk_ua_ship_ukr_settings['sender']['private']['name'] . ' ' : ''; 40 $middlename = isset($mrk_ua_ship_ukr_settings['sender']['private']['middlename']) ? $mrk_ua_ship_ukr_settings['sender']['private']['middlename'] . ' ' : ''; 41 $companyname = isset($mrk_ua_ship_ukr_settings['sender']['private']['name_main']) ? $mrk_ua_ship_ukr_settings['sender']['private']['name_main'] . ' ' : ''; 42 $phone = isset($mrk_ua_ship_ukr_settings['sender']['private']['phone']) ? $mrk_ua_ship_ukr_settings['sender']['private']['phone'] . ' ' : ''; 29 elseif($sender_type && $sender_type != 'INDIVIDUAL') 30 { 31 $lastname = (isset($mrk_ua_ship_ukr_settings['sender']['company']['lastname']) && $mrk_ua_ship_ukr_settings['sender']['company']['lastname']) ? $mrk_ua_ship_ukr_settings['sender']['company']['lastname'] : $lastname; 32 33 if(!$lastname){ 34 $lastname = (isset($mrk_ua_ship_ukr_settings['sender']['private']['lastname']) && $mrk_ua_ship_ukr_settings['sender']['private']['lastname']) ? $mrk_ua_ship_ukr_settings['sender']['private']['lastname'] : $lastname; 35 } 36 37 $name = (isset($mrk_ua_ship_ukr_settings['sender']['company']['name']) && $mrk_ua_ship_ukr_settings['sender']['company']['name']) ? $mrk_ua_ship_ukr_settings['sender']['company']['name'] : $name; 38 39 if(!$name) 40 { 41 $name = (isset($mrk_ua_ship_ukr_settings['sender']['private']['name']) && $mrk_ua_ship_ukr_settings['sender']['private']['name']) ? $mrk_ua_ship_ukr_settings['sender']['private']['name'] : $name; 42 } 43 44 $middlename = (isset($mrk_ua_ship_ukr_settings['sender']['private']['middlename']) && $mrk_ua_ship_ukr_settings['sender']['private']['middlename']) ? $mrk_ua_ship_ukr_settings['sender']['private']['middlename'] : $middlename; 45 46 $phone = (isset($mrk_ua_ship_ukr_settings['sender']['company']['phone']) && $mrk_ua_ship_ukr_settings['sender']['company']['phone']) ? $mrk_ua_ship_ukr_settings['sender']['company']['phone'] : $phone; 47 48 if(!$phone) 49 { 50 $phone = (isset($mrk_ua_ship_ukr_settings['sender']['private']['phone']) && $mrk_ua_ship_ukr_settings['sender']['private']['phone']) ? $mrk_ua_ship_ukr_settings['sender']['private']['phone'] : $phone; 51 } 43 52 } 44 53 else … … 47 56 } 48 57 49 $fullname = $lastname . $name . $middlename . $companyname;58 $fullname = $lastname . $name . $middlename; 50 59 51 60 if(!$lastname && !$name) -
morkva-ua-shipping/trunk/templates/settings/methods/shipping_fields/mrkv-ua-shipping-ukr-poshta.php
r3255478 r3257576 84 84 <div class="col-mrkv-5"> 85 85 <?php 86 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['type']) ? MRKV_SHIPPING_SETTINGS['sender']['type'] : ''; 86 $data_sender_type = isset(MRKV_SHIPPING_SETTINGS['sender']['type']) ? MRKV_SHIPPING_SETTINGS['sender']['type'] : ''; 87 $sender_lastname = isset(MRKV_SHIPPING_SETTINGS['sender']['individual']['lastname']) ? MRKV_SHIPPING_SETTINGS['sender']['individual']['lastname'] : ''; 88 $sender_firstname = isset(MRKV_SHIPPING_SETTINGS['sender']['individual']['name']) ? MRKV_SHIPPING_SETTINGS['sender']['individual']['name'] : ''; 89 $sender_middlename = isset(MRKV_SHIPPING_SETTINGS['sender']['individual']['middlename']) ? MRKV_SHIPPING_SETTINGS['sender']['individual']['middlename'] : ''; 90 $sender_phone = isset(MRKV_SHIPPING_SETTINGS['sender']['individual']['phone']) ? MRKV_SHIPPING_SETTINGS['sender']['individual']['phone'] : ''; 91 92 if($data_sender_type && $data_sender_type != 'INDIVIDUAL') 93 { 94 $data_sender_type = 'INDIVIDUAL'; 95 $sender_lastname = (isset(MRKV_SHIPPING_SETTINGS['sender']['company']['lastname']) && MRKV_SHIPPING_SETTINGS['sender']['company']['lastname']) ? MRKV_SHIPPING_SETTINGS['sender']['company']['lastname'] : $sender_lastname; 96 97 if(!$sender_lastname){ 98 $sender_lastname = (isset(MRKV_SHIPPING_SETTINGS['sender']['private']['lastname']) && MRKV_SHIPPING_SETTINGS['sender']['private']['lastname']) ? MRKV_SHIPPING_SETTINGS['sender']['private']['lastname'] : $sender_lastname; 99 } 100 101 $sender_firstname = (isset(MRKV_SHIPPING_SETTINGS['sender']['company']['name']) && MRKV_SHIPPING_SETTINGS['sender']['company']['name']) ? MRKV_SHIPPING_SETTINGS['sender']['company']['name'] : $sender_firstname; 102 103 if(!$sender_firstname) 104 { 105 $sender_firstname = (isset(MRKV_SHIPPING_SETTINGS['sender']['private']['name']) && MRKV_SHIPPING_SETTINGS['sender']['private']['name']) ? MRKV_SHIPPING_SETTINGS['sender']['private']['name'] : $sender_firstname; 106 } 107 108 $sender_middlename = (isset(MRKV_SHIPPING_SETTINGS['sender']['private']['middlename']) && MRKV_SHIPPING_SETTINGS['sender']['private']['middlename']) ? MRKV_SHIPPING_SETTINGS['sender']['private']['middlename'] : $sender_middlename; 109 110 $sender_phone = (isset(MRKV_SHIPPING_SETTINGS['sender']['company']['phone']) && MRKV_SHIPPING_SETTINGS['sender']['company']['phone']) ? MRKV_SHIPPING_SETTINGS['sender']['company']['phone'] : $sender_phone; 111 112 if(!$sender_phone) 113 { 114 $sender_phone = (isset(MRKV_SHIPPING_SETTINGS['sender']['private']['phone']) && MRKV_SHIPPING_SETTINGS['sender']['private']['phone']) ? MRKV_SHIPPING_SETTINGS['sender']['private']['phone'] : $sender_phone; 115 } 116 } 117 87 118 $senders_type_list = array( 88 'INDIVIDUAL' => __('An individual', 'mrkv-ua-shipping'), 89 'COMPANY' => __('Legal entity', 'mrkv-ua-shipping'), 90 'PRIVATE_ENTREPRENEUR' => __('An individual entrepreneur (IE)', 'mrkv-ua-shipping'), 119 'INDIVIDUAL' => __('An individual', 'mrkv-ua-shipping') 91 120 ); 92 121 93 122 $description = __('The choice affects the fields that need to be filled in in the setup', 'mrkv-ua-shipping'); 94 123 95 echo $mrkv_global_option_generator->get_select_simple(__('The sender represents', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][type]', $senders_type_list, $data , MRKV_OPTION_OBJECT_NAME . '_sender_type' , __('Choose a type', 'mrkv-ua-shipping'), $description);124 echo $mrkv_global_option_generator->get_select_simple(__('The sender represents', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][type]', $senders_type_list, $data_sender_type, MRKV_OPTION_OBJECT_NAME . '_sender_type' , __('Choose a type', 'mrkv-ua-shipping'), $description); 96 125 ?> 97 126 </div> … … 106 135 </div> 107 136 </div> 108 <?php109 $data_sender_type = isset(MRKV_SHIPPING_SETTINGS['sender']['type']) ? MRKV_SHIPPING_SETTINGS['sender']['type'] : '';110 ?>111 137 <div class="admin_ua_ship_morkva_settings_line__inner active" id="<?php echo MRKV_OPTION_OBJECT_NAME; ?>_sender_type_list"> 112 138 <div data-sender="DEFAULT" class="<?php echo MRKV_OPTION_OBJECT_NAME; ?>_sender_type_block <?php if(!$data_sender_type){ echo 'active'; } ?>"> … … 128 154 <div class="col-mrkv-5"> 129 155 <?php 130 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['individual']['lastname']) ? MRKV_SHIPPING_SETTINGS['sender']['individual']['lastname'] : '';156 $data = $sender_lastname; 131 157 echo $mrkv_global_option_generator->get_input_text(__('Lastname', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][individual][lastname]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_individual_lastname' , '', __('Enter the lastname...', 'mrkv-ua-shipping'), ''); 132 158 ?> … … 135 161 <div class="col-mrkv-5"> 136 162 <?php 137 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['individual']['name']) ? MRKV_SHIPPING_SETTINGS['sender']['individual']['name'] : '';163 $data = $sender_firstname; 138 164 echo $mrkv_global_option_generator->get_input_text(__('Name', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][individual][name]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_individual_name' , '', __('Enter the name...', 'mrkv-ua-shipping'), ''); 139 165 ?> … … 144 170 <div class="col-mrkv-5"> 145 171 <?php 146 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['individual']['middlename']) ? MRKV_SHIPPING_SETTINGS['sender']['individual']['middlename'] : '';172 $data = $sender_middlename; 147 173 echo $mrkv_global_option_generator->get_input_text(__('Middlename', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][individual][middlename]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_individual_middlename' , '', __('Enter the middlename...', 'mrkv-ua-shipping'), ''); 148 174 ?> … … 151 177 <div class="col-mrkv-5"> 152 178 <?php 153 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['individual']['phone']) ? MRKV_SHIPPING_SETTINGS['sender']['individual']['phone'] : '';179 $data = $sender_phone; 154 180 $description = __('Hint: the main format is 0987654321 (without +38)', 'mrkv-ua-shipping'); 155 181 echo $mrkv_global_option_generator->get_input_text(__('Phone', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][individual][phone]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_individual_phone' , '', __('Enter the phone...', 'mrkv-ua-shipping'), $description); 156 182 ?> 157 </div>158 </div>159 </div>160 <div data-sender="COMPANY" class="<?php echo MRKV_OPTION_OBJECT_NAME; ?>_sender_type_block <?php if($data_sender_type == 'COMPANY'){ echo 'active'; } ?>">161 <div class="admin_ua_ship_morkva_settings_row">162 <div class="col-mrkv-5">163 <?php164 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['company']['lastname']) ? MRKV_SHIPPING_SETTINGS['sender']['company']['lastname'] : '';165 echo $mrkv_global_option_generator->get_input_text(__('Lastname', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][company][lastname]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_company_lastname' , '', __('Enter the lastname...', 'mrkv-ua-shipping'), '');166 ?>167 <p></p>168 </div>169 <div class="col-mrkv-5">170 <?php171 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['company']['name']) ? MRKV_SHIPPING_SETTINGS['sender']['company']['name'] : '';172 echo $mrkv_global_option_generator->get_input_text(__('Name', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][company][name]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_company_name' , '', __('Enter the name...', 'mrkv-ua-shipping'), '');173 ?>174 <p></p>175 </div>176 </div>177 <div class="admin_ua_ship_morkva_settings_row">178 <div class="col-mrkv-5">179 <?php180 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['company']['name_main']) ? MRKV_SHIPPING_SETTINGS['sender']['company']['name_main'] : '';181 echo $mrkv_global_option_generator->get_input_text(__('Name of the company / individual entrepreneur', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][company][name_main]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_company_name_main' , '', __('Enter the company name...', 'mrkv-ua-shipping'), '');182 ?>183 <p></p>184 </div>185 <div class="col-mrkv-5">186 <?php187 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['company']['iban']) ? MRKV_SHIPPING_SETTINGS['sender']['company']['iban'] : '';188 echo $mrkv_global_option_generator->get_input_text(__('IBAN account', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][company][iban]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_company_iban' , '', __('Enter the iban...', 'mrkv-ua-shipping'), '');189 ?>190 <p></p>191 </div>192 </div>193 <div class="admin_ua_ship_morkva_settings_row">194 <div class="col-mrkv-5">195 <?php196 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['company']['edrpou']) ? MRKV_SHIPPING_SETTINGS['sender']['company']['edrpou'] : '';197 echo $mrkv_global_option_generator->get_input_text(__('EDRPOU', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][company][edrpou]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_company_edrpou' , '', __('Enter the EDRPOU...', 'mrkv-ua-shipping'), '');198 ?>199 <p></p>200 </div>201 <div class="col-mrkv-5">202 <?php203 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['company']['phone']) ? MRKV_SHIPPING_SETTINGS['sender']['company']['phone'] : '';204 $description = __('Hint: the main format is 0987654321 (without +38)', 'mrkv-ua-shipping');205 echo $mrkv_global_option_generator->get_input_text(__('Phone', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][company][phone]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_company_phone' , '', __('Enter the phone...', 'mrkv-ua-shipping'), $description);206 ?>207 </div>208 </div>209 <?php210 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['company']['postpay']) ? MRKV_SHIPPING_SETTINGS['sender']['company']['postpay'] : '';211 echo $mrkv_global_option_generator->get_input_checkbox(__('Receive cash on delivery by bank transfer', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][company][postpay]', $data, MRKV_OPTION_OBJECT_NAME . '_sender_company_postpay', );212 ?>213 <?php echo '<p class="mrkv-ua-ship-description">' . __('Cash on delivery to a current account is possible only for the Sender - a legal entity or individual entrepreneur and for the STANDARD shipment type with the declared value.', 'mrkv-ua-shipping') . '</p>'; ?>214 </div>215 <div data-sender="PRIVATE_ENTREPRENEUR" class="<?php echo MRKV_OPTION_OBJECT_NAME; ?>_sender_type_block <?php if($data_sender_type == 'PRIVATE_ENTREPRENEUR'){ echo 'active'; } ?>">216 <div class="admin_ua_ship_morkva_settings_row">217 <div class="col-mrkv-5">218 <?php219 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['private']['lastname']) ? MRKV_SHIPPING_SETTINGS['sender']['private']['lastname'] : '';220 echo $mrkv_global_option_generator->get_input_text(__('Lastname', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][private][lastname]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_private_lastname' , '', __('Enter the lastname...', 'mrkv-ua-shipping'), '');221 ?>222 <p></p>223 </div>224 <div class="col-mrkv-5">225 <?php226 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['private']['name']) ? MRKV_SHIPPING_SETTINGS['sender']['private']['name'] : '';227 echo $mrkv_global_option_generator->get_input_text(__('Name', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][private][name]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_private_name' , '', __('Enter the name...', 'mrkv-ua-shipping'), '');228 ?>229 <p></p>230 </div>231 </div>232 <div class="admin_ua_ship_morkva_settings_row">233 <div class="col-mrkv-5">234 <?php235 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['private']['middlename']) ? MRKV_SHIPPING_SETTINGS['sender']['private']['middlename'] : '';236 echo $mrkv_global_option_generator->get_input_text(__('Middlename', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][private][middlename]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_private_middlename' , '', __('Enter the middlename...', 'mrkv-ua-shipping'), '');237 ?>238 <p></p>239 </div>240 <div class="col-mrkv-5">241 <?php242 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['private']['phone']) ? MRKV_SHIPPING_SETTINGS['sender']['private']['phone'] : '';243 $description = __('Hint: the main format is 0987654321 (without +38)', 'mrkv-ua-shipping');244 echo $mrkv_global_option_generator->get_input_text(__('Phone', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][private][phone]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_private_phone' , '', __('Enter the phone...', 'mrkv-ua-shipping'), $description);245 ?>246 </div>247 </div>248 <div class="admin_ua_ship_morkva_settings_row">249 <div class="col-mrkv-5">250 <?php251 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['private']['name_main']) ? MRKV_SHIPPING_SETTINGS['sender']['private']['name_main'] : '';252 echo $mrkv_global_option_generator->get_input_text(__('Name of the company / individual entrepreneur', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][private][name_main]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_private_name_main' , '', __('Enter the company name...', 'mrkv-ua-shipping'), '');253 ?>254 <p></p>255 </div>256 <div class="col-mrkv-5">257 <?php258 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['private']['iban']) ? MRKV_SHIPPING_SETTINGS['sender']['private']['iban'] : '';259 echo $mrkv_global_option_generator->get_input_text(__('IBAN account', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][private][iban]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_private_iban' , '', __('Enter the iban...', 'mrkv-ua-shipping'), '');260 ?>261 <p></p>262 </div>263 </div>264 <div class="admin_ua_ship_morkva_settings_row">265 <div class="col-mrkv-5">266 <?php267 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['private']['ipn']) ? MRKV_SHIPPING_SETTINGS['sender']['private']['ipn'] : '';268 echo $mrkv_global_option_generator->get_input_text(__('Individual tax number (TIN)', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][private][ipn]', $data, MRKV_OPTION_OBJECT_NAME. '_sender_private_ipn' , '', __('Enter the Individual tax number...', 'mrkv-ua-shipping'), '');269 ?>270 <p></p>271 </div>272 <div class="col-mrkv-5">273 <?php274 $data = isset(MRKV_SHIPPING_SETTINGS['sender']['private']['postpay']) ? MRKV_SHIPPING_SETTINGS['sender']['private']['postpay'] : '';275 echo $mrkv_global_option_generator->get_input_checkbox(__('Receive cash on delivery by bank transfer', 'mrkv-ua-shipping'), MRKV_OPTION_OBJECT_NAME . '[sender][private][postpay]', $data, MRKV_OPTION_OBJECT_NAME . '_sender_private_postpay', );276 ?>277 <?php echo '<p class="mrkv-ua-ship-description">' . __('Cash on delivery to a current account is possible only for the Sender - a legal entity or individual entrepreneur and for the STANDARD shipment type with the declared value.', 'mrkv-ua-shipping') . '</p>'; ?>278 183 </div> 279 184 </div>
Note: See TracChangeset
for help on using the changeset viewer.