WordPress.org
Get WordPress

Plugin Directory

Changeset 3139121


Ignore:
Timestamp:
08/21/2024 01:59:34 PM (18 months ago)
Author:
amitrotem
Message:

Release version 2.0.11

Location:
wc-shipos-delivery
Files:
150 added
6 edited

Legend:

Unmodified
Added
Removed

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

    r3135554 r3139121  
    448448                            ' מספר שליחות: <span>' +
    449449                            response.data + '</span></div><a class="matat-button matat-print-button-new" target="_blank" data-order=' + dvsfw_order_id +
    450                             ' href="post.php?matat_pdf=create&amp;matat_label_wpnonce=' + lnonc + '&amp;order_id=' + dvsfw_order_id + '">' +
     450                            ' href="post.php?matat_pdf=create&amp;matat_label_wpnonce=' + lnonc + '&amp;order_id=' + dvsfw_order_id + '&amp;ship_id=' + response.shipping_id + '">' +
    451451                            'הדפס תוית</a>' + '<br><span style="color: #FF0006;margin-left: 10px">' + response.company + '</span>');
    452452                    } else {

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

    r3136140 r3139121  
    1 /*! wc-shipos-delivery 2.0.10 2024-08-15 6:47:23 PM */
    2 !function(){"use strict";jQuery(document).ready(function(l){function t(){var a=l('[name="dvsfw_is_pickup"]').prop("checked"),t=l('[name="dvsfw_google_maps_api_key"]').closest("tr"),e=l('[name="dvsfw_pickup_point_display_preference"]').closest("tr"),r=l('[name="dvsfw_pickup_point_default_display"]').closest("tr");a?(t.show(),e.show(),r.show(),o(),l(document).on("change",'[name="dvsfw_pickup_point_display_preference"]',function(a){o()})):(t.hide(),e.hide(),r.hide())}function o(){var a=l('[name="dvsfw_pickup_point_display_preference"]').val(),t=l('[name="dvsfw_pickup_point_default_display"]').closest("tr");"both"===a?t.show():t.hide()}l(document).on("click",".sync_pickup",function(a){a.preventDefault();let t=l(this);l.ajax({url:matat_delivery.ajax_url,type:"POST",data:{action:"matat_sync_pickup_point"},success:function(a){t.text(a)},error:function(){}})}),l(".ship_status").click(function(a){a.preventDefault();a=l(this).data("status");l.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&&(l(".matat_receiver_name").html(a.Records.Record.Receiver),l(".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}l(".matat_delivery_status").html(e),l(".matat_receiver_name").html(a.Records.Record.Receiver),l(".matat_shipped_on").html(a.Records.Record.ExeTime)}})}),l(document).on("click",".matat-open-button",function(t){t.preventDefault(),l(t.target).prop("disabled",!0),l("#matat_open_ship").append('<img class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'" alt="shipos-loader">');var a=l("button.matat-open-button").attr("data-order");let e="1",r=(!0===l("#matat_urgent").is(":checked")&&(e="2"),"1"),o=(!0===l("#dvsfw_return").is(":checked")&&(r="2"),l("#matat_collect").val());isNaN(o)&&(o="NO");var s=l("#matat_motor").val(),_=l("#dvsfw_packages").val(),d=l("#dvsfw_exaction_date").val(),n=l("input[name=dvsfw_delivey_type]:checked").val();l(".matat_error_message").remove(),l.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:o,matat_motor:s,dvsfw_packages:_,dvsfw_exaction_date:d,dvsfw_delivey_type:n,dvsfw_wpnonce:matat_delivery.matat_ajax_nonce},success:function(a){l(".matat_loader").hide(),l(".matat-powered-by").show(),a.success?location.reload():(l(".matat-button-container-open").append('<p class="matat_error_message">'+a.data+"</p>"),l(t.target).prop("disabled",!1))},error:function(){l(".matat_loader").hide(),l(".matat-powered-by").show(),l("#matat_open_ship").append('<p class="matat_error_message">'+matat_delivery.matat_err_message+"</p>"),l(t.target).prop("disabled",!1)}})}),l(document).on("click",".matat-open-button-new",function(t){t.preventDefault(),console.log(t.target),l(t.target).prop("disabled",!0),l("#matat_open_ship_new").append('<img class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'" alt="shipos-loader">');var a=l("button.matat-open-button-new").attr("data-order");let e="1",r=(!0===l("#matat_urgent").is(":checked")&&(e="2"),"1"),o=(!0===l("#dvsfw_return_new").is(":checked")&&(r="2"),l("#matat_collect").val());isNaN(o)&&(o="NO");var s=l("#matat_motor").val(),_=l("#dvsfw_packages_new").val(),d=l("#dvsfw_license_new").val(),n=l("#dvsfw_exaction_date_new").val(),i=l("input[name=dvsfw_delivey_type_new]:checked").val();l(".matat_error_message").remove(),l.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:o,matat_motor:s,dvsfw_packages:_,dvsfw_license:d,dvsfw_exaction_date:n,dvsfw_delivey_type:i,dvsfw_wpnonce:matat_delivery.matat_ajax_nonce},success:function(a){l(".matat_loader").hide(),l(".matat-powered-by-new").show(),a.success?location.reload():(l(".matat-button-container-open-new").append('<p class="matat_error_message">'+a.data+"</p>"),l(t.target).prop("disabled",!1))},error:function(){l(".matat_loader").hide(),l(".matat-powered-by-new").show(),l("#matat_open_ship_new").append('<p class="matat_error_message">'+matat_delivery.matat_err_message+"</p>"),l(t.target).prop("disabled",!1)}})}),l(document).on("click",".matat-cancel-ship",function(a){a.preventDefault();var t=l(this).closest(".matat-button-container"),a=(t.append('<img class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'">'),l(this).data("shipping-id")),e=l(this).data("license-key"),r=l(this).data("order-id");l.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){l(".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(){l(".matat_loader").hide(),t.append("<p>"+matat_delivery.matat_err_message+"</p>")}})}),l(document).on("click",".matat-reopen-ship",function(a){a.preventDefault(),l("#matat_ship_exists").hide(),l(".matat-powered-by").hide(),l(".matat-wrapper").append('<img class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'">');a=l("#matat_ship_exists").attr("data-order");l.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(){l(".matat_loader").hide(),l(".matat-powered-by").show(),l(".matat-wrapper").append("<p>"+matat_delivery.matat_err_message+"</p>")}})}),l("#matat_collect").change(function(){0==l(".matat_nis").length&&l("#matat_collect").after("<span class='matat_nis'>&#8362</span>")}),l(".matat_shop_order_delivery").click(function(a){a.preventDefault();var t=l(this).closest("button.matat_shop_order_delivery").attr("data-order"),e=l(".matat-table-deliv-not.order-"+t),r=l("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),o=String(a.getDate()).padStart(2,"0"),s=String(a.getMonth()+1).padStart(2,"0"),s=a=a.getFullYear()+"-"+s+"-"+o;l.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:s,dvsfw_delivey_type:"1",dvsfw_wpnonce:matat_delivery.matat_ajax_nonce},success:function(a){console.log(a),l(".matat_loader").hide(),l(".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><br><span style="color: #FF0006;margin-left: 10px">'+a.company+"</span>"):e.append('<div style="color:red">'+a.data+"</div>")},error:function(){l(".matat_loader").hide(),l(".matat-powered-by").show(),l("#matat_open_ship").append("<p>"+matat_delivery.matat_err_message+"</p>")}})}),l(".matat_shop_order_delivery_new").click(function(a){a.preventDefault();var t=l(this).closest("button.matat_shop_order_delivery_new").attr("data-order"),a=l(this).closest("button.matat_shop_order_delivery_new").attr("data-license"),e=l(".matat-table-deliv-not-new.order-"+t),r=l("button.matat_shop_order_delivery_new").attr("data-nonce"),o=(e.append('<img width="70px" class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'">'),new Date),s=String(o.getDate()).padStart(2,"0"),_=String(o.getMonth()+1).padStart(2,"0"),_=o=o.getFullYear()+"-"+_+"-"+s;l.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_license:a,dvsfw_exaction_date:_,dvsfw_delivey_type:"1",dvsfw_wpnonce:matat_delivery.matat_ajax_nonce},success:function(a){console.log(a),l(".matat_loader").hide(),l(".matat-powered-by").show(),a.success?e.text("").html('<div class="matat-table-deliv-num-new">\n מספר שליחות: <span>'+a.data+'</span></div><a class="matat-button matat-print-button-new" target="_blank" data-order='+t+' href="post.php?matat_pdf=create&amp;matat_label_wpnonce='+r+"&amp;order_id="+t+'">הדפס תוית</a><br><span style="color: #FF0006;margin-left: 10px">'+a.company+"</span>"):e.append('<div style="color:red">'+a.data+"</div>")},error:function(){l(".matat_loader").hide(),l(".matat-powered-by").show(),l("#matat_open_ship").append("<p>"+matat_delivery.matat_err_message+"</p>")}})}),l(document).on("submit","#posts-filter",function(a){"cargo_bulk"==l("#bulk-action-selector-top").val()?l("#doaction").prop("disabled",!0):l("#doaction").prop("disabled",!1)}),l(document).on("change",'[name="dvsfw_automatic"]',function(a){"yes"==l(this).val()?l(".auto_delivery").removeClass("hidden"):l(".auto_delivery").addClass("hidden")}),t(),l(document).on("change",'[name="dvsfw_is_pickup"]',function(a){t()}),l(document).on("click","#doaction",function(a){if("undefined"!=typeof pagenow&&"edit-shop_order"===pagenow&&"shipos_bulk"===l("#bulk-action-selector-top").val()){a.preventDefault();a=l("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")}})})}();
     1/*! wc-shipos-delivery 2.0.11 2024-08-21 7:39:18 PM */
     2!function(){"use strict";jQuery(document).ready(function(l){function t(){var a=l('[name="dvsfw_is_pickup"]').prop("checked"),t=l('[name="dvsfw_google_maps_api_key"]').closest("tr"),e=l('[name="dvsfw_pickup_point_display_preference"]').closest("tr"),r=l('[name="dvsfw_pickup_point_default_display"]').closest("tr");a?(t.show(),e.show(),r.show(),s(),l(document).on("change",'[name="dvsfw_pickup_point_display_preference"]',function(a){s()})):(t.hide(),e.hide(),r.hide())}function s(){var a=l('[name="dvsfw_pickup_point_display_preference"]').val(),t=l('[name="dvsfw_pickup_point_default_display"]').closest("tr");"both"===a?t.show():t.hide()}l(document).on("click",".sync_pickup",function(a){a.preventDefault();let t=l(this);l.ajax({url:matat_delivery.ajax_url,type:"POST",data:{action:"matat_sync_pickup_point"},success:function(a){t.text(a)},error:function(){}})}),l(".ship_status").click(function(a){a.preventDefault();a=l(this).data("status");l.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&&(l(".matat_receiver_name").html(a.Records.Record.Receiver),l(".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}l(".matat_delivery_status").html(e),l(".matat_receiver_name").html(a.Records.Record.Receiver),l(".matat_shipped_on").html(a.Records.Record.ExeTime)}})}),l(document).on("click",".matat-open-button",function(t){t.preventDefault(),l(t.target).prop("disabled",!0),l("#matat_open_ship").append('<img class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'" alt="shipos-loader">');var a=l("button.matat-open-button").attr("data-order");let e="1",r=(!0===l("#matat_urgent").is(":checked")&&(e="2"),"1"),s=(!0===l("#dvsfw_return").is(":checked")&&(r="2"),l("#matat_collect").val());isNaN(s)&&(s="NO");var o=l("#matat_motor").val(),_=l("#dvsfw_packages").val(),d=l("#dvsfw_exaction_date").val(),n=l("input[name=dvsfw_delivey_type]:checked").val();l(".matat_error_message").remove(),l.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){l(".matat_loader").hide(),l(".matat-powered-by").show(),a.success?location.reload():(l(".matat-button-container-open").append('<p class="matat_error_message">'+a.data+"</p>"),l(t.target).prop("disabled",!1))},error:function(){l(".matat_loader").hide(),l(".matat-powered-by").show(),l("#matat_open_ship").append('<p class="matat_error_message">'+matat_delivery.matat_err_message+"</p>"),l(t.target).prop("disabled",!1)}})}),l(document).on("click",".matat-open-button-new",function(t){t.preventDefault(),console.log(t.target),l(t.target).prop("disabled",!0),l("#matat_open_ship_new").append('<img class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'" alt="shipos-loader">');var a=l("button.matat-open-button-new").attr("data-order");let e="1",r=(!0===l("#matat_urgent").is(":checked")&&(e="2"),"1"),s=(!0===l("#dvsfw_return_new").is(":checked")&&(r="2"),l("#matat_collect").val());isNaN(s)&&(s="NO");var o=l("#matat_motor").val(),_=l("#dvsfw_packages_new").val(),d=l("#dvsfw_license_new").val(),n=l("#dvsfw_exaction_date_new").val(),i=l("input[name=dvsfw_delivey_type_new]:checked").val();l(".matat_error_message").remove(),l.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_license:d,dvsfw_exaction_date:n,dvsfw_delivey_type:i,dvsfw_wpnonce:matat_delivery.matat_ajax_nonce},success:function(a){l(".matat_loader").hide(),l(".matat-powered-by-new").show(),a.success?location.reload():(l(".matat-button-container-open-new").append('<p class="matat_error_message">'+a.data+"</p>"),l(t.target).prop("disabled",!1))},error:function(){l(".matat_loader").hide(),l(".matat-powered-by-new").show(),l("#matat_open_ship_new").append('<p class="matat_error_message">'+matat_delivery.matat_err_message+"</p>"),l(t.target).prop("disabled",!1)}})}),l(document).on("click",".matat-cancel-ship",function(a){a.preventDefault();var t=l(this).closest(".matat-button-container"),a=(t.append('<img class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'">'),l(this).data("shipping-id")),e=l(this).data("license-key"),r=l(this).data("order-id");l.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){l(".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(){l(".matat_loader").hide(),t.append("<p>"+matat_delivery.matat_err_message+"</p>")}})}),l(document).on("click",".matat-reopen-ship",function(a){a.preventDefault(),l("#matat_ship_exists").hide(),l(".matat-powered-by").hide(),l(".matat-wrapper").append('<img class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'">');a=l("#matat_ship_exists").attr("data-order");l.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(){l(".matat_loader").hide(),l(".matat-powered-by").show(),l(".matat-wrapper").append("<p>"+matat_delivery.matat_err_message+"</p>")}})}),l("#matat_collect").change(function(){0==l(".matat_nis").length&&l("#matat_collect").after("<span class='matat_nis'>&#8362</span>")}),l(".matat_shop_order_delivery").click(function(a){a.preventDefault();var t=l(this).closest("button.matat_shop_order_delivery").attr("data-order"),e=l(".matat-table-deliv-not.order-"+t),r=l("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;l.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),l(".matat_loader").hide(),l(".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><br><span style="color: #FF0006;margin-left: 10px">'+a.company+"</span>"):e.append('<div style="color:red">'+a.data+"</div>")},error:function(){l(".matat_loader").hide(),l(".matat-powered-by").show(),l("#matat_open_ship").append("<p>"+matat_delivery.matat_err_message+"</p>")}})}),l(".matat_shop_order_delivery_new").click(function(a){a.preventDefault();var t=l(this).closest("button.matat_shop_order_delivery_new").attr("data-order"),a=l(this).closest("button.matat_shop_order_delivery_new").attr("data-license"),e=l(".matat-table-deliv-not-new.order-"+t),r=l("button.matat_shop_order_delivery_new").attr("data-nonce"),s=(e.append('<img width="70px" class="matat_loader" src="'+matat_delivery.matat_ajax_loader+'">'),new Date),o=String(s.getDate()).padStart(2,"0"),_=String(s.getMonth()+1).padStart(2,"0"),_=s=s.getFullYear()+"-"+_+"-"+o;l.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_license:a,dvsfw_exaction_date:_,dvsfw_delivey_type:"1",dvsfw_wpnonce:matat_delivery.matat_ajax_nonce},success:function(a){console.log(a),l(".matat_loader").hide(),l(".matat-powered-by").show(),a.success?e.text("").html('<div class="matat-table-deliv-num-new">\n מספר שליחות: <span>'+a.data+'</span></div><a class="matat-button matat-print-button-new" target="_blank" data-order='+t+' href="post.php?matat_pdf=create&amp;matat_label_wpnonce='+r+"&amp;order_id="+t+"&amp;ship_id="+a.shipping_id+'">הדפס תוית</a><br><span style="color: #FF0006;margin-left: 10px">'+a.company+"</span>"):e.append('<div style="color:red">'+a.data+"</div>")},error:function(){l(".matat_loader").hide(),l(".matat-powered-by").show(),l("#matat_open_ship").append("<p>"+matat_delivery.matat_err_message+"</p>")}})}),l(document).on("submit","#posts-filter",function(a){"cargo_bulk"==l("#bulk-action-selector-top").val()?l("#doaction").prop("disabled",!0):l("#doaction").prop("disabled",!1)}),l(document).on("change",'[name="dvsfw_automatic"]',function(a){"yes"==l(this).val()?l(".auto_delivery").removeClass("hidden"):l(".auto_delivery").addClass("hidden")}),t(),l(document).on("change",'[name="dvsfw_is_pickup"]',function(a){t()}),l(document).on("click","#doaction",function(a){if("undefined"!=typeof pagenow&&"edit-shop_order"===pagenow&&"shipos_bulk"===l("#bulk-action-selector-top").val()){a.preventDefault();a=l("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-ajax.php

    r3135554 r3139121  
    192192        );
    193193
    194         $order->add_order_note( $message );
    195 
    196         if ( ! $automatic ) {
    197             $response = [
    198                 "data"    => $ship_data['delivery_number'],
    199                 "company" => $ship_data['company']->name,
    200                 "success" => true
    201             ];
    202             wp_send_json( $response, null, 0 );
    203         } else {
    204             return [
    205                 "data"    => $ship_data['delivery_number'],
    206                 "message" => $message,
    207                 "success" => true
    208             ];
    209         }
    210     }
     194        $order->add_order_note($message);
     195        $matat_order_meta  = Utils::get_order_meta( $order_id, '_dvsfw_ship_data', false );
     196        $last = array_key_last( $matat_order_meta );
     197
     198        if (!$automatic) {
     199            $response = [
     200                "data" => $ship_data['delivery_number'],
     201                "shipping_id" => $last,
     202                "company" => $ship_data['company']->name,
     203                "success" => true
     204            ];
     205            wp_send_json($response, null, 0);
     206        } else {
     207            return [
     208                "data" => $ship_data['delivery_number'],
     209                "shipping_id" => $last,
     210                "message" => $message,
     211                "success" => true
     212            ];
     213        }
     214    }
    211215
    212216    /**

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

    r3136140 r3139121  
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: Deliver via Shipos for WooCommerce 2.0.10\n"
     5"Project-Id-Version: Deliver via Shipos for WooCommerce 2.0.11\n"
    66"Report-Msgid-Bugs-To: "
    77"https://wordpress.org/support/plugin/wc-shipos-delivery\n"
    8 "POT-Creation-Date: 2024-08-15 13:02:23+00:00\n"
     8"POT-Creation-Date: 2024-08-21 13:54:18+00:00\n"
    99"MIME-Version: 1.0\n"
    1010"Content-Type: text/plain; charset=utf-8\n"
    … …  
    207207msgstr ""
    208208
    209 #: class/class-ajax.php:37 class/class-ajax.php:219 class/class-ajax.php:236
    210 #: class/class-ajax.php:267 class/class-delivery.php:132
     209#: class/class-ajax.php:37 class/class-ajax.php:223 class/class-ajax.php:240
     210#: class/class-ajax.php:271 class/class-delivery.php:132
    211211msgid "Failed security check"
    212212msgstr ""
    … …  
    221221msgstr ""
    222222
    223 #: class/class-ajax.php:251
     223#: class/class-ajax.php:255
    224224msgid " Order canceled"
    225225msgstr ""
    226226
    227 #: class/class-ajax.php:279 includes/Pickup.php:415
     227#: class/class-ajax.php:283 includes/Pickup.php:415
    228228msgid "Failed to initialise WC_Filesystem API while trying to sync Shipos Cities."
    229229msgstr ""
    230230
    231 #: class/class-ajax.php:295
     231#: class/class-ajax.php:299
    232232msgid "Json file retrieved locally"
    233233msgstr ""
    234234
    235 #: class/class-ajax.php:300
     235#: class/class-ajax.php:304
    236236msgid "Locations retrieved from server"
    237237msgstr ""

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

    r3136140 r3139121  
    44Requires at least: 5.8.0
    55Tested up to: 6.5.2
    6 Stable tag: 2.0.10
     6Stable tag: 2.0.11
    77Requires PHP: 7.4
    88License: GPLv2 or later
    … …  
    8484== Changelog ==
    8585
     86= 2.0.11 =
     87* Fix issue where shipping label was not generated in some cases
     88
    8689= 2.0.10 =
    8790* Fix issue where shipping label was not generated in some cases

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

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