WordPress.org
Get WordPress

Plugin Directory

Changeset 3102325


Ignore:
Timestamp:
06/13/2024 01:22:11 PM (21 months ago)
Author:
amitrotem
Message:

Release: 2.0.7

Location:
wc-shipos-delivery/trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • wc-shipos-delivery/trunk/admin/js/wc-shipos-delivery-admin.min.js

    r2999706 r3102325  
    1 /*! wc-shipos-delivery 1.1.4 2023-11-21 11:30:57 PM */
    2 !function(){"use strict";jQuery(document).ready(function(i){function t(){var a=i('[name="dvsfw_is_pickup"]').prop("checked"),t=i('[name="dvsfw_google_maps_api_key"]').closest("tr"),e=i('[name="dvsfw_pickup_point_display_preference"]').closest("tr"),r=i('[name="dvsfw_pickup_point_default_display"]').closest("tr");a?(t.show(),e.show(),r.show(),s(),i(document).on("change",'[name="dvsfw_pickup_point_display_preference"]',function(a){s()})):(t.hide(),e.hide(),r.hide())}function s(){var a=i('[name="dvsfw_pickup_point_display_preference"]').val(),t=i('[name="dvsfw_pickup_point_default_display"]').closest("tr");"both"===a?t.show():t.hide()}i(document).on("click",".sync_pickup",function(a){a.preventDefault();let t=i(this);i.ajax({url:matat_delivery.ajax_url,type:"POST",data:{action:"matat_sync_pickup_point"},success:function(a){t.text(a)},error:function(){}})}),i(".ship_status").click(function(a){a.preventDefault();a=i(this).data("status");i.ajax({url:matat_delivery.ajax_url,type:"POST",data:{action:"matat_get_order_details",dvsfw_order_id:a,matat_get_wpnonce:matat_delivery.matat_ajax_get_nonce},success:function(a){var a=JSON.parse(a),t=(console.log(a),a.Records.Record.DeliveryStatus),e="";switch(1!=t&&2!=t&&(i(".matat_receiver_name").html(a.Records.Record.Receiver),i(".matat_shipped_on").html(a.Records.Record.ExeTime)),t){case"1":e=matat_delivery.matat_status_1;break;case"2":e=matat_delivery.matat_status_2;break;case"3":e=matat_delivery.matat_status_3;break;case"4":e=matat_delivery.matat_status_4;break;case"5":e=matat_delivery.matat_status_5;break;case"7":e=matat_delivery.matat_status_7;break;case"8":e=matat_delivery.matat_status_8;break;case"9":e=matat_delivery.matat_status_9;break;case"12":e=matat_delivery.matat_status_12}i(".matat_delivery_status").html(e),i(".matat_receiver_name").html(a.Records.Record.Receiver),i(".matat_shipped_on").html(a.Records.Record.ExeTime)}})}),i(document).on("click",".matat-open-button",function(t){t.preventDefault(),i(t.target).prop("disabled",!0),i("#matat_open_ship").append('<img class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'" alt="shipos-loader">');var a=i("button.matat-open-button").attr("data-order");let e="1",r=(!0===i("#matat_urgent").is(":checked")&&(e="2"),"1"),s=(!0===i("#dvsfw_return").is(":checked")&&(r="2"),i("#matat_collect").val());isNaN(s)&&(s="NO");var _=i("#matat_motor").val(),o=i("#dvsfw_packages").val(),d=i("#dvsfw_exaction_date").val(),n=i("input[name=dvsfw_delivey_type]:checked").val();i(".matat_error_message").remove(),i.ajax({url:matat_delivery.ajax_url,type:"POST",data:{action:"matat_open_new_order",dvsfw_order_id:a,matat_urgent:e,dvsfw_return:r,matat_collect:s,matat_motor:_,dvsfw_packages:o,dvsfw_exaction_date:d,dvsfw_delivey_type:n,dvsfw_wpnonce:matat_delivery.matat_ajax_nonce},success:function(a){i(".matat_loader").hide(),i(".matat-powered-by").show(),a.success?location.reload():(i(".matat-button-container-open").append('<p class="matat_error_message">'+a.data+"</p>"),i(t.target).prop("disabled",!1))},error:function(){i(".matat_loader").hide(),i(".matat-powered-by").show(),i("#matat_open_ship").append('<p class="matat_error_message">'+matat_delivery.matat_err_message+"</p>"),i(t.target).prop("disabled",!1)}})}),i(document).on("click",".matat-cancel-ship",function(a){a.preventDefault();var t=i(this).closest(".matat-button-container"),a=(t.append('<img class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'">'),i(this).data("shipping-id")),e=i(this).data("order-id");i.ajax({url:matat_delivery.ajax_url,type:"POST",data:{action:"matat_change_order_status",dvsfw_ship_id:a,order_id:e,matat_change_wpnonce:matat_delivery.matat_ajax_change_nonce},success:function(a){i(".matat_loader").hide(),a.success?(location.reload(),t.closest(".matat-wrapper").append('<p class="matat_error_message">'+matat_delivery.matat_cancel_ship_ok+"</p>")):(a=a.data.message||matat_delivery.matat_err_message,t.closest(".matat-wrapper").append('<p class="matat_error_message">'+a+"</p>"))},error:function(){i(".matat_loader").hide(),t.append("<p>"+matat_delivery.matat_err_message+"</p>")}})}),i(document).on("click",".matat-reopen-ship",function(a){a.preventDefault(),i("#matat_ship_exists").hide(),i(".matat-powered-by").hide(),i(".matat-wrapper").append('<img class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'">');a=i("#matat_ship_exists").attr("data-order");i.ajax({url:matat_delivery.ajax_url,type:"POST",data:{action:"dvsfw_reopen_ship",dvsfw_woo_order_id:a,dvsfw_reopen_wpnonce:matat_delivery.matat_ajax_reopen_nonce},success:function(a){location.reload()},error:function(){i(".matat_loader").hide(),i(".matat-powered-by").show(),i(".matat-wrapper").append("<p>"+matat_delivery.matat_err_message+"</p>")}})}),i("#matat_collect").change(function(){0==i(".matat_nis").length&&i("#matat_collect").after("<span class='matat_nis'>&#8362</span>")}),i(".matat_shop_order_delivery").click(function(a){a.preventDefault();var t=i(this).closest("button.matat_shop_order_delivery").attr("data-order"),e=i(".order-"+t),r=i("button.matat_shop_order_delivery").attr("data-nonce"),a=(e.append('<img width="70px" class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'">'),new Date),s=String(a.getDate()).padStart(2,"0"),_=String(a.getMonth()+1).padStart(2,"0"),_=a=a.getFullYear()+"-"+_+"-"+s;i.ajax({url:matat_delivery.ajax_url,type:"POST",data:{action:"matat_open_new_order",dvsfw_order_id:t,matat_urgent:"1",dvsfw_return:"1",matat_collect:"NO",matat_motor:"1",dvsfw_packages:"1",dvsfw_exaction_date:_,dvsfw_delivey_type:"1",dvsfw_wpnonce:matat_delivery.matat_ajax_nonce},success:function(a){console.log(a),i(".matat_loader").hide(),i(".matat-powered-by").show(),a.success?e.text("").html('<div class="matat-table-deliv-num">\n מספר שליחות: <span>'+a.data+'</span></div><a class="matat-button matat-print-button" target="_blank" data-order='+t+' href="post.php?matat_pdf=create&amp;matat_label_wpnonce='+r+"&amp;order_id="+t+'">הדפס תוית</a>'):e.append('<div style="color:red">'+a.data+"</div>")},error:function(){i(".matat_loader").hide(),i(".matat-powered-by").show(),i("#matat_open_ship").append("<p>"+matat_delivery.matat_err_message+"</p>")}})}),i(document).on("submit","#posts-filter",function(a){"cargo_bulk"==i("#bulk-action-selector-top").val()?i("#doaction").prop("disabled",!0):i("#doaction").prop("disabled",!1)}),i(document).on("change",'[name="dvsfw_automatic"]',function(a){"yes"==i(this).val()?i(".auto_delivery").removeClass("hidden"):i(".auto_delivery").addClass("hidden")}),t(),i(document).on("change",'[name="dvsfw_is_pickup"]',function(a){t()})})}();
     1/*! wc-shipos-delivery 2.0.7 2024-06-13 6:52:35 PM */
     2!function(){"use strict";jQuery(document).ready(function(i){function t(){var a=i('[name="dvsfw_is_pickup"]').prop("checked"),t=i('[name="dvsfw_google_maps_api_key"]').closest("tr"),e=i('[name="dvsfw_pickup_point_display_preference"]').closest("tr"),r=i('[name="dvsfw_pickup_point_default_display"]').closest("tr");a?(t.show(),e.show(),r.show(),s(),i(document).on("change",'[name="dvsfw_pickup_point_display_preference"]',function(a){s()})):(t.hide(),e.hide(),r.hide())}function s(){var a=i('[name="dvsfw_pickup_point_display_preference"]').val(),t=i('[name="dvsfw_pickup_point_default_display"]').closest("tr");"both"===a?t.show():t.hide()}i(document).on("click",".sync_pickup",function(a){a.preventDefault();let t=i(this);i.ajax({url:matat_delivery.ajax_url,type:"POST",data:{action:"matat_sync_pickup_point"},success:function(a){t.text(a)},error:function(){}})}),i(".ship_status").click(function(a){a.preventDefault();a=i(this).data("status");i.ajax({url:matat_delivery.ajax_url,type:"POST",data:{action:"matat_get_order_details",dvsfw_order_id:a,matat_get_wpnonce:matat_delivery.matat_ajax_get_nonce},success:function(a){var a=JSON.parse(a),t=(console.log(a),a.Records.Record.DeliveryStatus),e="";switch(1!=t&&2!=t&&(i(".matat_receiver_name").html(a.Records.Record.Receiver),i(".matat_shipped_on").html(a.Records.Record.ExeTime)),t){case"1":e=matat_delivery.matat_status_1;break;case"2":e=matat_delivery.matat_status_2;break;case"3":e=matat_delivery.matat_status_3;break;case"4":e=matat_delivery.matat_status_4;break;case"5":e=matat_delivery.matat_status_5;break;case"7":e=matat_delivery.matat_status_7;break;case"8":e=matat_delivery.matat_status_8;break;case"9":e=matat_delivery.matat_status_9;break;case"12":e=matat_delivery.matat_status_12}i(".matat_delivery_status").html(e),i(".matat_receiver_name").html(a.Records.Record.Receiver),i(".matat_shipped_on").html(a.Records.Record.ExeTime)}})}),i(document).on("click",".matat-open-button",function(t){t.preventDefault(),i(t.target).prop("disabled",!0),i("#matat_open_ship").append('<img class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'" alt="shipos-loader">');var a=i("button.matat-open-button").attr("data-order");let e="1",r=(!0===i("#matat_urgent").is(":checked")&&(e="2"),"1"),s=(!0===i("#dvsfw_return").is(":checked")&&(r="2"),i("#matat_collect").val());isNaN(s)&&(s="NO");var o=i("#matat_motor").val(),_=i("#dvsfw_packages").val(),d=i("#dvsfw_exaction_date").val(),n=i("input[name=dvsfw_delivey_type]:checked").val();i(".matat_error_message").remove(),i.ajax({url:matat_delivery.ajax_url,type:"POST",data:{action:"matat_open_new_order",dvsfw_order_id:a,matat_urgent:e,dvsfw_return:r,matat_collect:s,matat_motor:o,dvsfw_packages:_,dvsfw_exaction_date:d,dvsfw_delivey_type:n,dvsfw_wpnonce:matat_delivery.matat_ajax_nonce},success:function(a){i(".matat_loader").hide(),i(".matat-powered-by").show(),a.success?location.reload():(i(".matat-button-container-open").append('<p class="matat_error_message">'+a.data+"</p>"),i(t.target).prop("disabled",!1))},error:function(){i(".matat_loader").hide(),i(".matat-powered-by").show(),i("#matat_open_ship").append('<p class="matat_error_message">'+matat_delivery.matat_err_message+"</p>"),i(t.target).prop("disabled",!1)}})}),i(document).on("click",".matat-cancel-ship",function(a){a.preventDefault();var t=i(this).closest(".matat-button-container"),a=(t.append('<img class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'">'),i(this).data("shipping-id")),e=i(this).data("license-key"),r=i(this).data("order-id");i.ajax({url:matat_delivery.ajax_url,type:"POST",data:{action:"matat_change_order_status",dvsfw_ship_id:a,dvsfw_license_key:e,order_id:r,matat_change_wpnonce:matat_delivery.matat_ajax_change_nonce},success:function(a){i(".matat_loader").hide(),a.success?(location.reload(),t.closest(".matat-wrapper").append('<p class="matat_error_message">'+matat_delivery.matat_cancel_ship_ok+"</p>")):(a=a.data.message||matat_delivery.matat_err_message,t.closest(".matat-wrapper").append('<p class="matat_error_message">'+a+"</p>"))},error:function(){i(".matat_loader").hide(),t.append("<p>"+matat_delivery.matat_err_message+"</p>")}})}),i(document).on("click",".matat-reopen-ship",function(a){a.preventDefault(),i("#matat_ship_exists").hide(),i(".matat-powered-by").hide(),i(".matat-wrapper").append('<img class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'">');a=i("#matat_ship_exists").attr("data-order");i.ajax({url:matat_delivery.ajax_url,type:"POST",data:{action:"dvsfw_reopen_ship",dvsfw_woo_order_id:a,dvsfw_reopen_wpnonce:matat_delivery.matat_ajax_reopen_nonce},success:function(a){location.reload()},error:function(){i(".matat_loader").hide(),i(".matat-powered-by").show(),i(".matat-wrapper").append("<p>"+matat_delivery.matat_err_message+"</p>")}})}),i("#matat_collect").change(function(){0==i(".matat_nis").length&&i("#matat_collect").after("<span class='matat_nis'>&#8362</span>")}),i(".matat_shop_order_delivery").click(function(a){a.preventDefault();var t=i(this).closest("button.matat_shop_order_delivery").attr("data-order"),e=i(".matat-table-deliv-not.order-"+t),r=i("button.matat_shop_order_delivery").attr("data-nonce"),a=(e.append('<img width="70px" class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'">'),new Date),s=String(a.getDate()).padStart(2,"0"),o=String(a.getMonth()+1).padStart(2,"0"),o=a=a.getFullYear()+"-"+o+"-"+s;i.ajax({url:matat_delivery.ajax_url,type:"POST",data:{action:"matat_open_new_order",dvsfw_order_id:t,matat_urgent:"1",dvsfw_return:"1",matat_collect:"NO",matat_motor:"1",dvsfw_packages:"1",dvsfw_exaction_date:o,dvsfw_delivey_type:"1",dvsfw_wpnonce:matat_delivery.matat_ajax_nonce},success:function(a){console.log(a),i(".matat_loader").hide(),i(".matat-powered-by").show(),a.success?e.text("").html('<div class="matat-table-deliv-num">\n מספר שליחות: <span>'+a.data+'</span></div><a class="matat-button matat-print-button" target="_blank" data-order='+t+' href="post.php?matat_pdf=create&amp;matat_label_wpnonce='+r+"&amp;order_id="+t+'">הדפס תוית</a>'):e.append('<div style="color:red">'+a.data+"</div>")},error:function(){i(".matat_loader").hide(),i(".matat-powered-by").show(),i("#matat_open_ship").append("<p>"+matat_delivery.matat_err_message+"</p>")}})}),i(document).on("submit","#posts-filter",function(a){"cargo_bulk"==i("#bulk-action-selector-top").val()?i("#doaction").prop("disabled",!0):i("#doaction").prop("disabled",!1)}),i(document).on("change",'[name="dvsfw_automatic"]',function(a){"yes"==i(this).val()?i(".auto_delivery").removeClass("hidden"):i(".auto_delivery").addClass("hidden")}),t(),i(document).on("change",'[name="dvsfw_is_pickup"]',function(a){t()}),i(document).on("click","#doaction",function(a){if("undefined"!=typeof pagenow&&"edit-shop_order"===pagenow&&"shipos_bulk"===i("#bulk-action-selector-top").val()){a.preventDefault();a=i("form#posts-filter").serializeArray().filter(a=>"post[]"===a.name).map(a=>a.value);if(a.length){let t=new URLSearchParams;t.append("page","deliver-via-shipos"),a.forEach(a=>{t.append("dvsfw_select_ids[]",a)}),t.append("dvsfw_action","bulk_ship");a=matat_delivery.admin_url+"?"+t.toString();window.open(a,"_blank")}else alert("Please select some orders")}})})}();

  • wc-shipos-delivery/trunk/class/class-admin.php

    r3076255 r3102325  
    3939                array(
    4040                    'ajax_url'                    => admin_url( 'admin-ajax.php' ),
     41                    'admin_url'                   => admin_url( 'admin.php' ),
    4142                    'matat_ajax_nonce'            => wp_create_nonce( 'dvsfw_submit_open_ship' ),
    4243                    'matat_ajax_get_nonce'        => wp_create_nonce( 'dvsfw_submit_get_ship' ),
    … …  
    403404    function shipos_page() {
    404405        if ( ! current_user_can( 'manage_woocommerce' ) ) {
    405             wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
     406            wp_die( __( 'You do not have sufficient permissions to access this page.', 'wc-shipos-delivery' ) );
    406407        }
    407408

  • wc-shipos-delivery/trunk/class/class-license.php

    r3017410 r3102325  
    6060    }
    6161
    62     public function shipos_activate_license() {
    63         $license = trim( sanitize_text_field( wp_unslash( $_POST['dvsfw_license_key'] ) ) );
     62    public function shipos_activate_license( $license_key = null ) {
     63        $license = trim( sanitize_text_field( wp_unslash( $license_key ?: $_POST['dvsfw_license_key'] ) ) );
    6464
    6565        $shipos_action = 'activate_license';

  • wc-shipos-delivery/trunk/class/class-rest-routes.php

    r3100360 r3102325  
    5050            return new WP_Error(
    5151                'rest_forbidden',
    52                 esc_html__('You are not authenticated.', 'text-domain'),
     52                esc_html__('You are not authenticated.', 'wc-shipos-delivery'),
    5353                array('status' => 401)
    5454            );
    … …  
    176176
    177177        update_option('dvsfw_license_key', $new_license_key);
     178        $license = License::getInstance();
     179        $license->shipos_activate_license($new_license_key);
    178180
    179181        return new WP_REST_Response(array(

  • wc-shipos-delivery/trunk/includes/Pickup.php

    r3046945 r3102325  
    5858                    ),
    5959                    'ignore_discounts' => array(
    60                         'title'       => __( 'Coupons discounts', 'woocommerce' ),
    61                         'label'       => __( 'Apply minimum order rule before coupon discount', 'woocommerce' ),
     60                        'title'       => __( 'Coupons discounts', 'wc-shipos-delivery' ),
     61                        'label'       => __( 'Apply minimum order rule before coupon discount', 'wc-shipos-delivery' ),
    6262                        'type'        => 'checkbox',
    63                         'description' => __( 'If checked, free shipping would be available based on pre-discount order amount.', 'woocommerce' ),
     63                        'description' => __( 'If checked, free shipping would be available based on pre-discount order amount.', 'wc-shipos-delivery' ),
    6464                        'default'     => 'no',
    6565                        'desc_tip'    => true,

  • wc-shipos-delivery/trunk/languages/wc-shipos-delivery.pot

    r3100360 r3102325  
    1 # Copyright (C) 2023 Amit Matat
     1# Copyright (C) 2024 Amit Matat
    22# This file is distributed under the GPL-2.0+.
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: Deliver via Shipos for WooCommerce 2.0.6\n"
     5"Project-Id-Version: Deliver via Shipos for WooCommerce 2.0.7\n"
    66"Report-Msgid-Bugs-To: "
    77"https://wordpress.org/support/plugin/wc-shipos-delivery\n"
    8 "POT-Creation-Date: 2023-11-21 17:45:57+00:00\n"
     8"POT-Creation-Date: 2024-06-13 13:07:35+00:00\n"
    99"MIME-Version: 1.0\n"
    1010"Content-Type: text/plain; charset=utf-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "PO-Revision-Date: 2023-MO-DA HO:MI+ZONE\n"
     12"PO-Revision-Date: 2024-MO-DA HO:MI+ZONE\n"
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    1414"Language-Team: LANGUAGE <[email protected]>\n"
    … …  
    2626"X-Generator: grunt-wp-i18n 1.0.3\n"
    2727
    28 #: class/class-admin.php:46
     28#: class/class-admin.php:47
    2929msgid "We are experiencing a communication error. Please try again later."
    3030msgstr ""
    3131
    32 #: class/class-admin.php:47
     32#: class/class-admin.php:48
    3333msgid "Cancel shipment"
    3434msgstr ""
    3535
    36 #: class/class-admin.php:48
     36#: class/class-admin.php:49
    3737msgid "Shipment canceled successfully"
    3838msgstr ""
    3939
    40 #: class/class-admin.php:49
     40#: class/class-admin.php:50
    4141msgid "Reopen shipment"
    4242msgstr ""
    4343
    44 #: class/class-admin.php:50
     44#: class/class-admin.php:51
    4545msgid "Open"
    4646msgstr ""
    4747
    48 #: class/class-admin.php:51
     48#: class/class-admin.php:52
    4949msgid "Delivery man on his way"
    5050msgstr ""
    5151
    52 #: class/class-admin.php:52
     52#: class/class-admin.php:53
    5353msgid "Delivered"
    5454msgstr ""
    5555
    56 #: class/class-admin.php:53
     56#: class/class-admin.php:54
    5757msgid "Collected from customer"
    5858msgstr ""
    5959
    60 #: class/class-admin.php:54
     60#: class/class-admin.php:55
    6161msgid "Back from costumer"
    6262msgstr ""
    6363
    64 #: class/class-admin.php:55
     64#: class/class-admin.php:56
    6565msgid "Approved"
    6666msgstr ""
    6767
    68 #: class/class-admin.php:56
     68#: class/class-admin.php:57
    6969msgid "Canceled"
    7070msgstr ""
    7171
    72 #: class/class-admin.php:57
     72#: class/class-admin.php:58
    7373msgid "Second delivery man "
    7474msgstr ""
    7575
    76 #: class/class-admin.php:58
     76#: class/class-admin.php:59
    7777msgid "On hold"
    7878msgstr ""
    7979
    80 #: class/class-admin.php:59
     80#: class/class-admin.php:60
    8181msgid ""
    8282"Error fetching data from Matat. Please check your API Settings on Settings "
    … …  
    8484msgstr ""
    8585
    86 #: class/class-admin.php:60
     86#: class/class-admin.php:61
    8787msgid ""
    8888"Error opening shipment in Matat. Please check your API Settings on Settings "
    … …  
    9090msgstr ""
    9191
    92 #: class/class-admin.php:103 class/class-admin.php:267
     92#: class/class-admin.php:109 class/class-admin.php:119
     93#: class/class-admin.php:310
    9394msgid "Matat Shipos"
    9495msgstr ""
    9596
    96 #: class/class-admin.php:123 class/class-admin.php:323
     97#: class/class-admin.php:143 class/class-admin.php:374
    9798msgid ""
    9899"Order shipping method is Local pickup. Create delivery option is disabled "
    … …  
    100101msgstr ""
    101102
    102 #: class/class-admin.php:146
     103#: class/class-admin.php:168
    103104msgid "Matat shipment details: "
    104105msgstr ""
    105106
    106 #: class/class-admin.php:154 class/class-ajax.php:175
     107#: class/class-admin.php:176 class/class-ajax.php:158
    107108msgid "Double delivery"
    108109msgstr ""
    109110
    110 #: class/class-admin.php:156 class/class-admin.php:234 class/class-ajax.php:177
    111 #: class/class-ajax.php:184
     111#: class/class-admin.php:178 class/class-admin.php:265 class/class-ajax.php:160
     112#: class/class-ajax.php:167
    112113msgid "Regular delivery"
    113114msgstr ""
    114115
    115 #: class/class-admin.php:159 class/class-ajax.php:180
     116#: class/class-admin.php:181 class/class-ajax.php:163
    116117msgid "Collecting delivery"
    117118msgstr ""
    118119
    119 #: class/class-admin.php:166 class/class-admin.php:247
     120#: class/class-admin.php:188 class/class-admin.php:284
    120121msgid "Shipment number:"
    121122msgstr ""
    122123
    123 #: class/class-admin.php:172 class/class-admin.php:250
    124 #: class/class-admin.php:315
     124#: class/class-admin.php:196 class/class-admin.php:290
     125#: class/class-admin.php:366
    125126msgid "Print label"
    126127msgstr ""
    127128
    128 #: class/class-admin.php:182 class/class-admin.php:305
     129#: class/class-admin.php:209 class/class-admin.php:354
    129130msgid "Shipment canceled"
    130131msgstr ""
    131132
    132 #: class/class-admin.php:184
     133#: class/class-admin.php:211
    133134msgid "Cancel delivery"
    134135msgstr ""
    135136
    136 #: class/class-admin.php:194
     137#: class/class-admin.php:223
    137138msgid "Delivery status"
    138139msgstr ""
    139140
    140 #: class/class-admin.php:197
     141#: class/class-admin.php:226
    141142msgid "Receiver name: "
    142143msgstr ""
    143144
    144 #: class/class-admin.php:198
     145#: class/class-admin.php:228
    145146msgid "Delivery time:"
    146147msgstr ""
    147148
    148 #: class/class-admin.php:199
     149#: class/class-admin.php:231
    149150msgid "Delivery status:"
    150151msgstr ""
    151152
    152 #: class/class-admin.php:200
     153#: class/class-admin.php:233
    153154msgid "Shipped on:"
    154155msgstr ""
    155156
    156 #: class/class-admin.php:216
    157 msgid ""
    158 "Notice: This plugin was installed after this order was made. Please check "
    159 "with Matat if you already opened this delivery. "
    160 msgstr ""
    161 
    162 #: class/class-admin.php:220
     157#: class/class-admin.php:247
    163158msgid "Create shipping:"
    164159msgstr ""
    165160
    166 #: class/class-admin.php:228
     161#: class/class-admin.php:257
    167162msgid "Double"
    168163msgstr ""
    169164
    170 #: class/class-admin.php:230
     165#: class/class-admin.php:260
    171166msgid "Amount to collect"
    172167msgstr ""
    173168
    174 #: class/class-admin.php:236
     169#: class/class-admin.php:268
    175170msgid "Collecting"
    176171msgstr ""
    177172
    178 #: class/class-admin.php:238
     173#: class/class-admin.php:270
    179174msgid "Packages:"
    180175msgstr ""
    181176
    182 #: class/class-admin.php:239
     177#: class/class-admin.php:274
    183178msgid "Deliver on:"
    184179msgstr ""
    185180
    186 #: class/class-admin.php:242
     181#: class/class-admin.php:279
    187182msgid "Open shipment"
    188183msgstr ""
    189184
    190 #: class/class-admin.php:254
     185#: class/class-admin.php:294
    191186msgid "Powered by"
    192187msgstr ""
    193188
    194 #: class/class-admin.php:297
     189#: class/class-admin.php:345
    195190msgid "Shipping method is Local pickup."
    196191msgstr ""
    197192
    198 #: class/class-admin.php:310
     193#: class/class-admin.php:359
    199194msgid "Delivery number:"
    200195msgstr ""
    201196
    202 #: class/class-admin.php:330
     197#: class/class-admin.php:382
    203198msgid "No delivery to display"
    204199msgstr ""
    205200
    206 #: class/class-admin.php:334
     201#: class/class-admin.php:388
    207202msgid "open delivery"
    208203msgstr ""
    209204
    210 #: class/class-ajax.php:37 class/class-ajax.php:214 class/class-ajax.php:231
    211 #: class/class-ajax.php:260 class/class-delivery.php:97
     205#: class/class-admin.php:406
     206msgid "You do not have sufficient permissions to access this page."
     207msgstr ""
     208
     209#: class/class-ajax.php:37 class/class-ajax.php:197 class/class-ajax.php:214
     210#: class/class-ajax.php:244 class/class-delivery.php:120
    212211msgid "Failed security check"
    213212msgstr ""
    214213
    215 #: class/class-ajax.php:149
     214#: class/class-ajax.php:131
    216215msgid "Error creating shipment"
    217216msgstr ""
    218217
    219 #: class/class-ajax.php:189
     218#: class/class-ajax.php:172
    220219#. translators: 1: Shipping Number, 2: Shipping Type
    221220msgid "Shipping successfully created, shipping number: %1$s Shipping type: %2$s"
    222221msgstr ""
    223222
    224 #: class/class-ajax.php:245
     223#: class/class-ajax.php:229
    225224msgid " Order canceled"
    226225msgstr ""
    227226
    228 #: class/class-ajax.php:269 includes/Pickup.php:377
     227#: class/class-ajax.php:253 includes/Pickup.php:404
    229228msgid "Failed to initialise WC_Filesystem API while trying to sync Shipos Cities."
    230229msgstr ""
    231230
    232 #: class/class-ajax.php:285
     231#: class/class-ajax.php:269
    233232msgid "Json file retrieved locally"
    234233msgstr ""
    235234
    236 #: class/class-ajax.php:290
     235#: class/class-ajax.php:274
    237236msgid "Locations retrieved from server"
    238237msgstr ""
    239238
    240 #: class/class-license.php:109 class/class-license.php:128
     239#: class/class-license.php:110 class/class-license.php:129
    241240msgid "An error occurred, please try again."
    242241msgstr ""
    243242
    244 #: class/class-license.php:120
     243#: class/class-license.php:121
    245244msgid "Your license key has been disabled."
    246245msgstr ""
    247246
    248 #: class/class-license.php:124
     247#: class/class-license.php:125
    249248msgid "Invalid license."
     249msgstr ""
     250
     251#: class/class-rest-routes.php:52
     252msgid "You are not authenticated."
    250253msgstr ""
    251254
    … …  
    346349msgstr ""
    347350
    348 #: class/class-settings.php:188
     351#: class/class-settings.php:187
    349352msgid "Test Mode"
    350353msgstr ""
    351354
    352 #: class/class-settings.php:190
     355#: class/class-settings.php:189
    353356msgid "Run the shipment for testing  ?"
    354357msgstr ""
    355358
    356 #: class/class-settings.php:218
     359#: class/class-settings.php:217
    357360msgid "Please fill the license field and start shipping."
    358361msgstr ""
    359362
    360 #: class/class-settings.php:240
     363#: class/class-settings.php:239
    361364msgid "License successfully activated"
    362365msgstr ""
    363366
    364 #: includes/Pickup.php:16 includes/Pickup.php:17 includes/Pickup.php:26
    365 #: includes/Pickup.php:29
     367#: includes/Pickup.php:25 includes/Pickup.php:26 includes/Pickup.php:35
     368#: includes/Pickup.php:38
    366369msgid "Shipos delivery"
    367370msgstr ""
    368371
    369 #: includes/Pickup.php:28
     372#: includes/Pickup.php:37
    370373msgid "This controls the title which the user sees during checkout."
    371374msgstr ""
    372375
    373 #: includes/Pickup.php:33
     376#: includes/Pickup.php:42
    374377msgid "Cost"
    375378msgstr ""
    376379
    377 #: includes/Pickup.php:35
     380#: includes/Pickup.php:44
    378381msgid "Enter delivery cost"
    379382msgstr ""
    380383
    381 #: includes/Pickup.php:39
     384#: includes/Pickup.php:48
    382385msgid "Discount cost"
    383386msgstr ""
    384387
    385 #: includes/Pickup.php:41
     388#: includes/Pickup.php:50
    386389msgid "Enter discount cost"
    387390msgstr ""
    388391
    389 #: includes/Pickup.php:45
     392#: includes/Pickup.php:54
    390393msgid "Discount cost condition"
    391394msgstr ""
    392395
    393 #: includes/Pickup.php:47
     396#: includes/Pickup.php:56
    394397msgid "Changing shipping method price if the order amount is higher than..."
    395398msgstr ""
    396399
    397 #: includes/Pickup.php:108
     400#: includes/Pickup.php:60
     401msgid "Coupons discounts"
     402msgstr ""
     403
     404#: includes/Pickup.php:61
     405msgid "Apply minimum order rule before coupon discount"
     406msgstr ""
     407
     408#: includes/Pickup.php:63
     409msgid ""
     410"If checked, free shipping would be available based on pre-discount order "
     411"amount."
     412msgstr ""
     413
     414#: includes/Pickup.php:135
    398415msgid "Click to select a pickup point"
    399416msgstr ""
    400417
    401 #: includes/Pickup.php:119
     418#: includes/Pickup.php:146
    402419msgid "Chosen Delivery Spot"
    403420msgstr ""
    404421
    405 #: includes/Pickup.php:156
     422#: includes/Pickup.php:183
    406423msgid "Choose a Collection Point"
    407424msgstr ""
    408425
    409 #: includes/Pickup.php:157
     426#: includes/Pickup.php:184
    410427msgid "Search and Select a collection point by origin address"
    411428msgstr ""
    412429
    413 #: includes/Pickup.php:164
     430#: includes/Pickup.php:191
    414431msgid "Select On Map"
    415432msgstr ""
    416433
    417 #: includes/Pickup.php:168
     434#: includes/Pickup.php:195
    418435msgid "Select Manually"
    419436msgstr ""
    420437
    421 #: includes/Pickup.php:187
     438#: includes/Pickup.php:214
    422439msgid "Selected pickup point:"
    423440msgstr ""
    424441
    425 #: includes/Pickup.php:197 includes/Pickup.php:276
     442#: includes/Pickup.php:224 includes/Pickup.php:303
    426443msgid "Select Collection Point"
    427444msgstr ""
    428445
    429 #: includes/Pickup.php:201 includes/Pickup.php:280
     446#: includes/Pickup.php:228 includes/Pickup.php:307
    430447msgid "Clear"
    431448msgstr ""
    432449
    433 #: includes/Pickup.php:228
     450#: includes/Pickup.php:255
    434451msgid "Search"
    435452msgstr ""
    436453
    437 #: includes/Pickup.php:239
     454#: includes/Pickup.php:266
    438455msgid "Total Results: "
    439456msgstr ""
    440457
    441 #: includes/Pickup.php:260
     458#: includes/Pickup.php:287
    442459msgid "View on Map"
    443460msgstr ""
    444461
    445 #: includes/Pickup.php:336
     462#: includes/Pickup.php:363
    446463msgid "Please select delivery spot."
    447464msgstr ""
    448465
    449 #: includes/Pickup.php:361 includes/Pickup.php:412
     466#: includes/Pickup.php:388 includes/Pickup.php:439
    450467msgid "Requested Delivery point"
    451468msgstr ""
    452469
    453 #: includes/Pickup.php:373
     470#: includes/Pickup.php:400
    454471msgid "Oops! Error getting response from server..."
    455472msgstr ""
    456473
    457 #: includes/Pickup.php:392
     474#: includes/Pickup.php:419
    458475msgid "Pickup location created successfully..."
    459476msgstr ""
    460477
    461 #: includes/Pickup.php:394
     478#: includes/Pickup.php:421
    462479msgid "Oops! Error creating pickup json file..."
    463480msgstr ""
    464481
    465482#: includes/matat-actions.php:40
    466 msgid "Create orders on matat shipos"
     483msgid "Ship OS - create bulk shipping"
    467484msgstr ""
    468485
    … …  
    471488msgstr ""
    472489
    473 #: includes/matat-actions.php:78
    474 #. translators: 1: WooCommerce Order id
    475 msgid "Order id (%1$d) Has local pickup shipping method."
    476 msgstr ""
    477 
    478 #: includes/matat-actions.php:89
    479 #. translators: 1: WooCommerce Order id
    480 msgid "Error: Order id (%1$d) data exist."
    481 msgstr ""
    482 
    483 #: includes/matat-actions.php:140
     490#: includes/matat-actions.php:110
    484491msgid "Error: None of the selected orders have shipments."
    485492msgstr ""
    486493
    487 #: includes/matat-actions.php:142
     494#: includes/matat-actions.php:112
    488495msgid "Error: No of selected shipments have exceeded max amount of 100."
    489496msgstr ""
    490497
    491 #: includes/matat-actions.php:167
     498#: includes/matat-actions.php:137
    492499#. translators: %d: WooCommerce Order id, %s: Error message
    493500msgid "There is an error with order id (%1$d): %2$s"
    494501msgstr ""
    495502
    496 #: includes/matat-actions.php:214
     503#: includes/matat-actions.php:184
    497504#. translators: %s: Shipping
    498505msgid "Shipping: %s"
    499506msgstr ""
    500507
    501 #: includes/matat-actions.php:226
     508#: includes/matat-actions.php:196
    502509#. translators: %s: Total
    503510msgid "%s Sent"
    504511msgstr ""
    505512
    506 #: wc-shipos-delivery.php:119
     513#: wc-shipos-delivery.php:140
    507514msgid ""
    508515"WooCommerce is not active. Please activate plugin before using Matat "
    … …  
    510517msgstr ""
    511518
    512 #: wc-shipos-delivery.php:127
     519#: wc-shipos-delivery.php:148
    513520msgid "Warning! Shipos is currently running in test mode."
    514521msgstr ""

  • wc-shipos-delivery/trunk/partials/options-page.php

    r3017423 r3102325  
    4242?>
    4343
    44 <div class="wrap woocommerce">
    45     <iframe src="<?php esc_html_e( $app_url ) ?>/wp/app? <?php esc_html_e( $query ) ?>#/orders?<?php esc_html_e( $spa_query ) ?>"
     44<div class="wrap woocommerce" style="margin: 10px 15px;">
     45    <iframe src="<?php esc_html_e( $app_url, 'wc-shipos-delivery' ) ?>/wp/app? <?php esc_html_e( $query, 'wc-shipos-delivery' ) ?>#/orders?<?php esc_html_e( $spa_query, 'wc-shipos-delivery' ) ?>"
    4646            style="width: 100%; height: 90vh"></iframe>
    4747    <script>

  • wc-shipos-delivery/trunk/readme.txt

    r3100360 r3102325  
    44Requires at least: 5.8.0
    55Tested up to: 6.5.2
    6 Stable tag: 2.0.6
     6Stable tag: 2.0.7
    77Requires PHP: 7.4
    88License: GPLv2 or later
    … …  
    8484== Changelog ==
    8585
    86 = 2.0.5 =
     86= 2.0.7 =
     87* Fix bug where license was not activated when automatically updated
     88
     89= 2.0.6 =
    8790* Open bulk shipment option in new tab
    8891* Add REST route for adding license key automatically

  • wc-shipos-delivery/trunk/wc-shipos-delivery.php

    r3100360 r3102325  
    55 * Plugin URI: https://matat.co.il/
    66 * Description: A plugin for Ship os Delivery orders from within WooCommerce.
    7  * Version: 2.0.6
     7 * Version: 2.0.7
    88 * Author: Amit Matat
    99 * Author URI: https://www.linkedin.com/in/amitmatatof/
    … …  
    4747 */
    4848define( 'DVSFW_PLUGIN_SLUG', 'wc-shipos-delivery' );
    49 define( 'DVSFW_PLUGIN_VERSION', '2.0.6' );
     49define( 'DVSFW_PLUGIN_VERSION', '2.0.7' );
    5050
    5151
Note: See TracChangeset for help on using the changeset viewer.