WordPress.org
Get WordPress

Plugin Directory

Changeset 3251743


Ignore:
Timestamp:
03/06/2025 01:37:45 PM (11 months ago)
Author:
bandido
Message:

Version 1.1.1

Location:
morkva-ua-shipping
Files:
190 added
7 edited

Legend:

Unmodified
Added
Removed

  • morkva-ua-shipping/trunk/README.txt

    r3250958 r3251743  
    55Tested up to: 6.7
    66Requires PHP: 7.0
    7 Stable tag: 1.1.0
     7Stable tag: 1.1.1
    88License: GPLv2
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    160160== Changelog ==
    161161
     162= 1.1.1 =
     163* [new] додали кнопки друку на сторінці результату створення ТТН
     164
    162165= 1.1.0 =
    163166* [new] додали новий спосіб доставки Rozetka Delivery

  • morkva-ua-shipping/trunk/assets/css/global/global-mrkv-ua-shipping.css

    r3190960 r3251743  
     1.print-ttn-mrkv-ua-ship, .print-sticker-mrkv-ua-ship{
     2    display: flex !important;
     3    align-items: center;
     4    justify-content: center;
     5    height: 38px;
     6    margin-bottom: 20px !important;
     7    border: 1px solid #ed6230;
     8    border-radius: 10px !important;
     9    text-decoration: unset !important;
     10    color: #ed6230 !important;
     11    background-color: transparent !important;
     12    font-size: 16px !important;
     13    font-weight: 600;
     14    border-color: #ed6230 !important;
     15    position: relative;
     16    margin-bottom: 0 !important;
     17    padding: 0 30px;
     18}
     19.print-ttn-mrkv-ua-ship:hover, .print-sticker-mrkv-ua-ship:hover{
     20    background-color: #ed6230 !important;
     21    color: #fff !important;
     22}
    123.mrkv-ua-shupping-change-method.button{
    224    background-color: #ed6230 !important;

  • morkva-ua-shipping/trunk/assets/js/global/global-mrkv-ua-shipping.js

    r3250958 r3251743  
    120120                    {
    121121                        jQuery('.mrkv_ua_ship_modal-content__message_completed').html(data.message);
     122
     123                        jQuery('.print-ttn-mrkv-ua-ship').attr('href', '');
     124                        jQuery('.print-ttn-mrkv-ua-ship').attr('data-ship', current_ship_key);
     125                        jQuery('.print-ttn-mrkv-ua-ship').attr('data-invoice', data.invoice);
     126                        jQuery('.print-sticker-mrkv-ua-ship').hide();
     127                        if(data.print)
     128                        {
     129                            jQuery('.print-ttn-mrkv-ua-ship').attr('href', data.print);
     130                        }
     131                        if(data.form_print)
     132                        {
     133                            jQuery('.print-ttn-mrkv-ua-ship').attr('data-form', data.form_print);
     134                        }
     135                        if(data.print_sticker)
     136                        {
     137                            jQuery('.print-sticker-mrkv-ua-ship').attr('href', data.print_sticker);
     138                            jQuery('.print-sticker-mrkv-ua-ship').show();
     139                        }
     140
    122141                        jQuery('#mrkv_ua_ship_create_invoice_completed').fadeIn(300);
    123142                        var order_id = jQuery('.mrkv_ua_ship_create_invoice__changed.active input[name="order_id"]').val();

  • morkva-ua-shipping/trunk/classes/shipping_methods/nova-poshta/invoice/mrkv-ua-shipping-nova-poshta-invoice.php

    r3250958 r3251743  
    230230                'message' => $message,
    231231                'invoice' => $invoice,
    232                 'arguments' => $args
     232                'arguments' => $args,
     233                'print' => 'https://my.novaposhta.ua/orders/printDocument/orders%5B%5D/' . $invoice . '/type/pdf/apiKey/' . $this->settings_shipping['api_key'],
     234                'form_print' => '',
     235                'print_sticker' =>  'https://my.novaposhta.ua/orders/printMarkings/orders[]/' . $invoice . '/type/pdf/apiKey/' . $this->settings_shipping['api_key']
    233236            );
    234237        }

  • morkva-ua-shipping/trunk/classes/shipping_methods/ukr-poshta/invoice/mrkv-ua-shipping-ukr-poshta-invoice.php

    r3248382 r3251743  
    157157                'message' => $message,
    158158                'invoice' => $invoice,
    159                 'arguments' => $args
     159                'arguments' => $args,
     160                'print' => '',
     161                'form_print' => 'form-ukr-poshta-ttn',
     162                'print_sticker' => ''
    160163            );
    161164        }

  • morkva-ua-shipping/trunk/mrkv-ua-shipping.php

    r3250958 r3251743  
    44 * Plugin URI: https://morkva.co.ua/product-category/plugins/
    55 * Description: 2-in-1: Nova Poshta and Ukrposhta delivery services. Create shipping methods and shipments easily
    6  * Version: 1.1.0
     6 * Version: 1.1.1
    77 * Author: MORKVA
    88 * Text Domain: mrkv-ua-shipping

  • morkva-ua-shipping/trunk/templates/orders/mrkv-ua-ship-popup.php

    r3190960 r3251743  
    8989        <div class="mrkv_ua_ship_create_invoice__footer">
    9090            <a class="close-error-mrkv-ua-ship"><?php echo __('Turn back', 'mrkv-ua-shipping'); ?></a>
     91            <a target="blanc" class="print-ttn-mrkv-ua-ship" data-ship="" data-invoice="" data-form=""><?php echo esc_html__('Print invoice', 'mrkv-ua-shipping'); ?></a>
     92            <a style="display: none;" href="" class="print-sticker-mrkv-ua-ship" target="blanc"><?php echo esc_html__('Print sticker', 'mrkv-ua-shipping'); ?></a>
    9193        </div>
    9294    </div>
Note: See TracChangeset for help on using the changeset viewer.