Merged in feature/117-dev-dev01 (pull request #8)
auto-patch 117-dev-dev01-2023-12-15T16_09_06 * auto-patch 117-dev-dev01-2023-12-15T16_09_06
This commit is contained in:
Tony Volpe
@@ -54,8 +54,10 @@
|
||||
events: {
|
||||
'click .modal-close': 'closeButton',
|
||||
'click #btn-ok' : 'addButton',
|
||||
'click #btn-next' : 'nextButton',
|
||||
'touchstart #btn-ok': 'addButton',
|
||||
'keydown' : 'keyboardActions'
|
||||
'keydown' : 'keyboardActions',
|
||||
'input' : 'handleInputValidation'
|
||||
},
|
||||
resizeContent: function() {
|
||||
var $content = $( '.wc-backbone-modal-content' ).find( 'article' );
|
||||
@@ -94,9 +96,9 @@
|
||||
|
||||
$( document.body ).trigger( 'wc_backbone_modal_loaded', this._target );
|
||||
},
|
||||
closeButton: function( e ) {
|
||||
closeButton: function( e, addButtonCalled ) {
|
||||
e.preventDefault();
|
||||
$( document.body ).trigger( 'wc_backbone_modal_before_remove', this._target );
|
||||
$( document.body ).trigger( 'wc_backbone_modal_before_remove', [ this._target, this.getFormData(), !!addButtonCalled ] );
|
||||
this.undelegateEvents();
|
||||
$( document ).off( 'focusin' );
|
||||
$( document.body ).css({
|
||||
@@ -107,12 +109,21 @@
|
||||
},
|
||||
addButton: function( e ) {
|
||||
$( document.body ).trigger( 'wc_backbone_modal_response', [ this._target, this.getFormData() ] );
|
||||
this.closeButton( e );
|
||||
this.closeButton( e, true );
|
||||
},
|
||||
getFormData: function() {
|
||||
nextButton: function( e ) {
|
||||
var context = this;
|
||||
function closeModal() {
|
||||
context.closeButton( e );
|
||||
}
|
||||
$( document.body ).trigger( 'wc_backbone_modal_next_response', [ this._target, this.getFormData(), closeModal ] );
|
||||
},
|
||||
getFormData: function( updating = true ) {
|
||||
var data = {};
|
||||
|
||||
$( document.body ).trigger( 'wc_backbone_modal_before_update', this._target );
|
||||
if ( updating ) {
|
||||
$( document.body ).trigger( 'wc_backbone_modal_before_update', this._target );
|
||||
}
|
||||
|
||||
$.each( $( 'form', this.$el ).serializeArray(), function( index, item ) {
|
||||
if ( item.name.indexOf( '[]' ) !== -1 ) {
|
||||
@@ -126,6 +137,9 @@
|
||||
|
||||
return data;
|
||||
},
|
||||
handleInputValidation: function() {
|
||||
$( document.body ).trigger( 'wc_backbone_modal_validation', [ this._target, this.getFormData( false ) ] );
|
||||
},
|
||||
keyboardActions: function( e ) {
|
||||
var button = e.keyCode || e.which;
|
||||
|
||||
@@ -134,7 +148,11 @@
|
||||
13 === button &&
|
||||
! ( e.target.tagName && ( e.target.tagName.toLowerCase() === 'input' || e.target.tagName.toLowerCase() === 'textarea' ) )
|
||||
) {
|
||||
this.addButton( e );
|
||||
if ( $( '#btn-ok' ).length ) {
|
||||
this.addButton( e );
|
||||
} else if ( $( '#btn-next' ).length ) {
|
||||
this.nextButton( e );
|
||||
}
|
||||
}
|
||||
|
||||
// ESC key
|
||||
|
||||
@@ -1 +1 @@
|
||||
!function(e,t,n){"use strict";e.fn.WCBackboneModal=function(t){return this.each(function(){new e.WCBackboneModal(e(this),t)})},e.WCBackboneModal=function(t,n){var o=e.extend({},e.WCBackboneModal.defaultOptions,n);o.template&&new e.WCBackboneModal.View({target:o.template,string:o.variable})},e.WCBackboneModal.defaultOptions={template:"",variable:{}},e.WCBackboneModal.View=t.View.extend({tagName:"div",id:"wc-backbone-modal-dialog",_target:undefined,_string:undefined,events:{"click .modal-close":"closeButton","click #btn-ok":"addButton","touchstart #btn-ok":"addButton",keydown:"keyboardActions"},resizeContent:function(){var t=e(".wc-backbone-modal-content").find("article"),n=.75*e(window).height();t.css({"max-height":n+"px"})},initialize:function(t){var o=this;this._target=t.target,this._string=t.string,n.bindAll(this,"render"),this.render(),e(window).on("resize",function(){o.resizeContent()})},render:function(){var t=wp.template(this._target);this.$el.append(t(this._string)),e(document.body).css({overflow:"hidden"}).append(this.$el),this.resizeContent(),this.$(".wc-backbone-modal-content").attr("tabindex","0").trigger("focus"),e(document.body).trigger("init_tooltips"),e(document.body).trigger("wc_backbone_modal_loaded",this._target)},closeButton:function(t){t.preventDefault(),e(document.body).trigger("wc_backbone_modal_before_remove",this._target),this.undelegateEvents(),e(document).off("focusin"),e(document.body).css({overflow:"auto"}),this.remove(),e(document.body).trigger("wc_backbone_modal_removed",this._target)},addButton:function(t){e(document.body).trigger("wc_backbone_modal_response",[this._target,this.getFormData()]),this.closeButton(t)},getFormData:function(){var t={};return e(document.body).trigger("wc_backbone_modal_before_update",this._target),e.each(e("form",this.$el).serializeArray(),function(n,o){-1!==o.name.indexOf("[]")?(o.name=o.name.replace("[]",""),t[o.name]=e.makeArray(t[o.name]),t[o.name].push(o.value)):t[o.name]=o.value}),t},keyboardActions:function(e){var t=e.keyCode||e.which;13!==t||e.target.tagName&&("input"===e.target.tagName.toLowerCase()||"textarea"===e.target.tagName.toLowerCase())||this.addButton(e),27===t&&this.closeButton(e)}})}(jQuery,Backbone,_);
|
||||
!function(t,e,n){"use strict";t.fn.WCBackboneModal=function(e){return this.each(function(){new t.WCBackboneModal(t(this),e)})},t.WCBackboneModal=function(e,n){var o=t.extend({},t.WCBackboneModal.defaultOptions,n);o.template&&new t.WCBackboneModal.View({target:o.template,string:o.variable})},t.WCBackboneModal.defaultOptions={template:"",variable:{}},t.WCBackboneModal.View=e.View.extend({tagName:"div",id:"wc-backbone-modal-dialog",_target:undefined,_string:undefined,events:{"click .modal-close":"closeButton","click #btn-ok":"addButton","click #btn-next":"nextButton","touchstart #btn-ok":"addButton",keydown:"keyboardActions",input:"handleInputValidation"},resizeContent:function(){var e=t(".wc-backbone-modal-content").find("article"),n=.75*t(window).height();e.css({"max-height":n+"px"})},initialize:function(e){var o=this;this._target=e.target,this._string=e.string,n.bindAll(this,"render"),this.render(),t(window).on("resize",function(){o.resizeContent()})},render:function(){var e=wp.template(this._target);this.$el.append(e(this._string)),t(document.body).css({overflow:"hidden"}).append(this.$el),this.resizeContent(),this.$(".wc-backbone-modal-content").attr("tabindex","0").trigger("focus"),t(document.body).trigger("init_tooltips"),t(document.body).trigger("wc_backbone_modal_loaded",this._target)},closeButton:function(e,n){e.preventDefault(),t(document.body).trigger("wc_backbone_modal_before_remove",[this._target,this.getFormData(),!!n]),this.undelegateEvents(),t(document).off("focusin"),t(document.body).css({overflow:"auto"}),this.remove(),t(document.body).trigger("wc_backbone_modal_removed",this._target)},addButton:function(e){t(document.body).trigger("wc_backbone_modal_response",[this._target,this.getFormData()]),this.closeButton(e,!0)},nextButton:function(e){var n=this;t(document.body).trigger("wc_backbone_modal_next_response",[this._target,this.getFormData(),function(){n.closeButton(e)}])},getFormData:function(e=!0){var n={};return e&&t(document.body).trigger("wc_backbone_modal_before_update",this._target),t.each(t("form",this.$el).serializeArray(),function(e,o){-1!==o.name.indexOf("[]")?(o.name=o.name.replace("[]",""),n[o.name]=t.makeArray(n[o.name]),n[o.name].push(o.value)):n[o.name]=o.value}),n},handleInputValidation:function(){t(document.body).trigger("wc_backbone_modal_validation",[this._target,this.getFormData(!1)])},keyboardActions:function(e){var n=e.keyCode||e.which;13!==n||e.target.tagName&&("input"===e.target.tagName.toLowerCase()||"textarea"===e.target.tagName.toLowerCase())||(t("#btn-ok").length?this.addButton(e):t("#btn-next").length&&this.nextButton(e)),27===n&&this.closeButton(e)}})}(jQuery,Backbone,_);
|
||||
@@ -8,44 +8,16 @@
|
||||
|
||||
// Backbone model
|
||||
ShippingClass = Backbone.Model.extend({
|
||||
changes: {},
|
||||
logChanges: function( changedRows ) {
|
||||
var changes = this.changes || {};
|
||||
|
||||
_.each( changedRows, function( row, id ) {
|
||||
changes[ id ] = _.extend( changes[ id ] || { term_id : id }, row );
|
||||
} );
|
||||
|
||||
this.changes = changes;
|
||||
this.trigger( 'change:classes' );
|
||||
},
|
||||
save: function() {
|
||||
if ( _.size( this.changes ) ) {
|
||||
$.post( ajaxurl + ( ajaxurl.indexOf( '?' ) > 0 ? '&' : '?' ) + 'action=woocommerce_shipping_classes_save_changes', {
|
||||
wc_shipping_classes_nonce : data.wc_shipping_classes_nonce,
|
||||
changes : this.changes
|
||||
}, this.onSaveResponse, 'json' );
|
||||
} else {
|
||||
shippingClass.trigger( 'saved:classes' );
|
||||
}
|
||||
},
|
||||
discardChanges: function( id ) {
|
||||
var changes = this.changes || {};
|
||||
|
||||
// Delete all changes
|
||||
delete changes[ id ];
|
||||
|
||||
// No changes? Disable save button.
|
||||
if ( 0 === _.size( this.changes ) ) {
|
||||
shippingClassView.clearUnloadConfirmation();
|
||||
}
|
||||
save: function( changes ) {
|
||||
$.post( ajaxurl + ( ajaxurl.indexOf( '?' ) > 0 ? '&' : '?' ) + 'action=woocommerce_shipping_classes_save_changes', {
|
||||
wc_shipping_classes_nonce : data.wc_shipping_classes_nonce,
|
||||
changes,
|
||||
}, this.onSaveResponse, 'json' );
|
||||
},
|
||||
onSaveResponse: function( response, textStatus ) {
|
||||
if ( 'success' === textStatus ) {
|
||||
if ( response.success ) {
|
||||
shippingClass.set( 'classes', response.data.shipping_classes );
|
||||
shippingClass.trigger( 'change:classes' );
|
||||
shippingClass.changes = {};
|
||||
shippingClass.trigger( 'saved:classes' );
|
||||
} else if ( response.data ) {
|
||||
window.alert( response.data );
|
||||
@@ -61,14 +33,11 @@
|
||||
ShippingClassView = Backbone.View.extend({
|
||||
rowTemplate: $row_template,
|
||||
initialize: function() {
|
||||
this.listenTo( this.model, 'change:classes', this.setUnloadConfirmation );
|
||||
this.listenTo( this.model, 'saved:classes', this.clearUnloadConfirmation );
|
||||
this.listenTo( this.model, 'saved:classes', this.render );
|
||||
$tbody.on( 'change', { view: this }, this.updateModelOnChange );
|
||||
$( window ).on( 'beforeunload', { view: this }, this.unloadConfirmation );
|
||||
$save_button.on( 'click', { view: this }, this.onSubmit );
|
||||
$( document.body ).on( 'click', '.wc-shipping-class-add', { view: this }, this.onAddNewRow );
|
||||
$( document.body ).on( 'click', '.wc-shipping-class-save-changes', { view: this }, this.onSubmit );
|
||||
$( document.body ).on( 'click', '.wc-shipping-class-add-new', { view: this }, this.configureNewShippingClass );
|
||||
$( document.body ).on( 'wc_backbone_modal_response', { view: this }, this.onConfigureShippingClassSubmitted );
|
||||
$( document.body ).on( 'wc_backbone_modal_loaded', { view: this }, this.onLoadBackboneModal );
|
||||
$( document.body ).on( 'wc_backbone_modal_validation', this.validateFormArguments );
|
||||
},
|
||||
block: function() {
|
||||
$( this.el ).block({
|
||||
@@ -83,8 +52,8 @@
|
||||
$( this.el ).unblock();
|
||||
},
|
||||
render: function() {
|
||||
var classes = _.indexBy( this.model.get( 'classes' ), 'term_id' ),
|
||||
view = this;
|
||||
var classes = _.indexBy( this.model.get( 'classes' ), 'term_id' ),
|
||||
view = this;
|
||||
|
||||
this.$el.empty();
|
||||
this.unblock();
|
||||
@@ -123,114 +92,111 @@
|
||||
$tr.find( '.edit' ).hide();
|
||||
$tr.find( '.wc-shipping-class-edit' ).on( 'click', { view: this }, this.onEditRow );
|
||||
$tr.find( '.wc-shipping-class-delete' ).on( 'click', { view: this }, this.onDeleteRow );
|
||||
$tr.find( '.editing .wc-shipping-class-edit' ).trigger('click');
|
||||
$tr.find( '.wc-shipping-class-cancel-edit' ).on( 'click', { view: this }, this.onCancelEditRow );
|
||||
},
|
||||
configureNewShippingClass: function( event ) {
|
||||
event.preventDefault();
|
||||
const term_id = 'new-1-' + Date.now();
|
||||
|
||||
// Editing?
|
||||
if ( true === rowData.editing ) {
|
||||
$tr.addClass( 'editing' );
|
||||
$tr.find( '.wc-shipping-class-edit' ).trigger( 'click' );
|
||||
$( this ).WCBackboneModal({
|
||||
template : 'wc-shipping-class-configure',
|
||||
variable : {
|
||||
term_id,
|
||||
action: 'create',
|
||||
},
|
||||
data : {
|
||||
term_id,
|
||||
action: 'create',
|
||||
}
|
||||
});
|
||||
},
|
||||
onConfigureShippingClassSubmitted: function( event, target, posted_data ) {
|
||||
if ( target === 'wc-shipping-class-configure' ) {
|
||||
const view = event.data.view;
|
||||
const model = view.model;
|
||||
const isNewRow = posted_data.term_id.includes( 'new-1-' );
|
||||
const rowData = {
|
||||
...posted_data,
|
||||
};
|
||||
|
||||
if ( isNewRow ) {
|
||||
rowData.newRow = true;
|
||||
}
|
||||
|
||||
view.block();
|
||||
|
||||
model.save( {
|
||||
[ posted_data.term_id ]: rowData
|
||||
} );
|
||||
}
|
||||
},
|
||||
onSubmit: function( event ) {
|
||||
event.data.view.block();
|
||||
event.data.view.model.save();
|
||||
event.preventDefault();
|
||||
},
|
||||
onAddNewRow: function( event ) {
|
||||
event.preventDefault();
|
||||
|
||||
var view = event.data.view,
|
||||
model = view.model,
|
||||
classes = _.indexBy( model.get( 'classes' ), 'term_id' ),
|
||||
changes = {},
|
||||
size = _.size( classes ),
|
||||
newRow = _.extend( {}, data.default_shipping_class, {
|
||||
term_id: 'new-' + size + '-' + Date.now(),
|
||||
editing: true,
|
||||
newRow : true
|
||||
} );
|
||||
|
||||
changes[ newRow.term_id ] = newRow;
|
||||
|
||||
model.logChanges( changes );
|
||||
view.renderRow( newRow );
|
||||
$( '.wc-shipping-classes-blank-state' ).remove();
|
||||
validateFormArguments: function( element, target, data ) {
|
||||
const requiredFields = [ 'name', 'description' ];
|
||||
const formIsComplete = Object.keys( data ).every( key => {
|
||||
if ( ! requiredFields.includes( key ) ) {
|
||||
return true;
|
||||
}
|
||||
if ( Array.isArray( data[ key ] ) ) {
|
||||
return data[ key ].length && !!data[ key ][ 0 ];
|
||||
}
|
||||
return !!data[ key ];
|
||||
} );
|
||||
const createButton = document.getElementById( 'btn-ok' );
|
||||
createButton.disabled = ! formIsComplete;
|
||||
createButton.classList.toggle( 'disabled', ! formIsComplete );
|
||||
},
|
||||
onEditRow: function( event ) {
|
||||
const term_id = $( this ).closest('tr').data('id');
|
||||
const model = event.data.view.model;
|
||||
const classes = _.indexBy( model.get( 'classes' ), 'term_id' );
|
||||
const rowData = classes[ term_id ];
|
||||
|
||||
event.preventDefault();
|
||||
$( this ).closest('tr').addClass('editing');
|
||||
$( this ).closest('tr').find('.view').hide();
|
||||
$( this ).closest('tr').find('.edit').show();
|
||||
event.data.view.model.trigger( 'change:classes' );
|
||||
$( this ).WCBackboneModal({
|
||||
template : 'wc-shipping-class-configure',
|
||||
variable : {
|
||||
action: 'edit',
|
||||
...rowData
|
||||
},
|
||||
data : {
|
||||
action: 'edit',
|
||||
...rowData
|
||||
}
|
||||
});
|
||||
},
|
||||
onLoadBackboneModal: function( event, target ) {
|
||||
if ( 'wc-shipping-class-configure' === target ) {
|
||||
const modalContent = $('.wc-backbone-modal-content');
|
||||
const term_id = modalContent.data('id');
|
||||
const model = event.data.view.model;
|
||||
const classes = _.indexBy( model.get( 'classes' ), 'term_id' );
|
||||
const rowData = classes[ term_id ];
|
||||
|
||||
if ( rowData ) {
|
||||
// Support select boxes
|
||||
$('.wc-backbone-modal-content').find( 'select' ).each( function() {
|
||||
var attribute = $( this ).data( 'attribute' );
|
||||
$( this ).find( 'option[value="' + rowData[ attribute ] + '"]' ).prop( 'selected', true );
|
||||
} );
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
onDeleteRow: function( event ) {
|
||||
var view = event.data.view,
|
||||
model = view.model,
|
||||
classes = _.indexBy( model.get( 'classes' ), 'term_id' ),
|
||||
changes = {},
|
||||
term_id = $( this ).closest('tr').data('id');
|
||||
|
||||
event.preventDefault();
|
||||
|
||||
if ( classes[ term_id ] ) {
|
||||
delete classes[ term_id ];
|
||||
changes[ term_id ] = _.extend( changes[ term_id ] || {}, { deleted : 'deleted' } );
|
||||
model.set( 'classes', classes );
|
||||
model.logChanges( changes );
|
||||
}
|
||||
view.block();
|
||||
|
||||
view.render();
|
||||
model.save( {
|
||||
[ term_id ]: {
|
||||
term_id,
|
||||
deleted: 'deleted',
|
||||
}
|
||||
} );
|
||||
},
|
||||
onCancelEditRow: function( event ) {
|
||||
var view = event.data.view,
|
||||
model = view.model,
|
||||
row = $( this ).closest('tr'),
|
||||
term_id = $( this ).closest('tr').data('id'),
|
||||
classes = _.indexBy( model.get( 'classes' ), 'term_id' );
|
||||
|
||||
event.preventDefault();
|
||||
model.discardChanges( term_id );
|
||||
|
||||
if ( classes[ term_id ] ) {
|
||||
classes[ term_id ].editing = false;
|
||||
row.after( view.rowTemplate( classes[ term_id ] ) );
|
||||
view.initRow( classes[ term_id ] );
|
||||
}
|
||||
|
||||
row.remove();
|
||||
},
|
||||
setUnloadConfirmation: function() {
|
||||
this.needsUnloadConfirm = true;
|
||||
$save_button.prop( 'disabled', false );
|
||||
},
|
||||
clearUnloadConfirmation: function() {
|
||||
this.needsUnloadConfirm = false;
|
||||
$save_button.attr( 'disabled', 'disabled' );
|
||||
},
|
||||
unloadConfirmation: function( event ) {
|
||||
if ( event.data.view.needsUnloadConfirm ) {
|
||||
event.returnValue = data.strings.unload_confirmation_msg;
|
||||
window.event.returnValue = data.strings.unload_confirmation_msg;
|
||||
return data.strings.unload_confirmation_msg;
|
||||
}
|
||||
},
|
||||
updateModelOnChange: function( event ) {
|
||||
var model = event.data.view.model,
|
||||
$target = $( event.target ),
|
||||
term_id = $target.closest( 'tr' ).data( 'id' ),
|
||||
attribute = $target.data( 'attribute' ),
|
||||
value = $target.val(),
|
||||
classes = _.indexBy( model.get( 'classes' ), 'term_id' ),
|
||||
changes = {};
|
||||
|
||||
if ( ! classes[ term_id ] || classes[ term_id ][ attribute ] !== value ) {
|
||||
changes[ term_id ] = {};
|
||||
changes[ term_id ][ attribute ] = value;
|
||||
}
|
||||
|
||||
model.logChanges( changes );
|
||||
}
|
||||
} ),
|
||||
shippingClass = new ShippingClass({
|
||||
classes: data.classes
|
||||
|
||||
@@ -1 +1 @@
|
||||
!function(e,i,s,n){e(function(){var t=e(".wc-shipping-class-rows"),a=e(".wc-shipping-class-save"),o=s.template("wc-shipping-class-row"),d=s.template("wc-shipping-class-row-blank"),c=Backbone.Model.extend({changes:{},logChanges:function(e){var i=this.changes||{};_.each(e,function(e,s){i[s]=_.extend(i[s]||{term_id:s},e)}),this.changes=i,this.trigger("change:classes")},save:function(){_.size(this.changes)?e.post(n+(n.indexOf("?")>0?"&":"?")+"action=woocommerce_shipping_classes_save_changes",{wc_shipping_classes_nonce:i.wc_shipping_classes_nonce,changes:this.changes},this.onSaveResponse,"json"):r.trigger("saved:classes")},discardChanges:function(e){delete(this.changes||{})[e],0===_.size(this.changes)&&h.clearUnloadConfirmation()},onSaveResponse:function(e,s){"success"===s&&(e.success?(r.set("classes",e.data.shipping_classes),r.trigger("change:classes"),r.changes={},r.trigger("saved:classes")):e.data?window.alert(e.data):window.alert(i.strings.save_failed)),h.unblock()}}),l=Backbone.View.extend({rowTemplate:o,initialize:function(){this.listenTo(this.model,"change:classes",this.setUnloadConfirmation),this.listenTo(this.model,"saved:classes",this.clearUnloadConfirmation),this.listenTo(this.model,"saved:classes",this.render),t.on("change",{view:this},this.updateModelOnChange),e(window).on("beforeunload",{view:this},this.unloadConfirmation),a.on("click",{view:this},this.onSubmit),e(document.body).on("click",".wc-shipping-class-add",{view:this},this.onAddNewRow),e(document.body).on("click",".wc-shipping-class-save-changes",{view:this},this.onSubmit)},block:function(){e(this.el).block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){e(this.el).unblock()},render:function(){var i=_.indexBy(this.model.get("classes"),"term_id"),s=this;this.$el.empty(),this.unblock(),_.size(i)?(i=_.sortBy(i,function(e){return e.name}),e.each(i,function(e,i){s.renderRow(i)})):s.$el.append(d)},renderRow:function(e){this.$el.append(this.rowTemplate(e)),this.initRow(e)},initRow:function(i){var s=this.$el.find('tr[data-id="'+i.term_id+'"]');s.find("select").each(function(){var s=e(this).data("attribute");e(this).find('option[value="'+i[s]+'"]').prop("selected",!0)}),s.find(".view").show(),s.find(".edit").hide(),s.find(".wc-shipping-class-edit").on("click",{view:this},this.onEditRow),s.find(".wc-shipping-class-delete").on("click",{view:this},this.onDeleteRow),s.find(".editing .wc-shipping-class-edit").trigger("click"),s.find(".wc-shipping-class-cancel-edit").on("click",{view:this},this.onCancelEditRow),!0===i.editing&&(s.addClass("editing"),s.find(".wc-shipping-class-edit").trigger("click"))},onSubmit:function(e){e.data.view.block(),e.data.view.model.save(),e.preventDefault()},onAddNewRow:function(s){s.preventDefault();var n=s.data.view,t=n.model,a=_.indexBy(t.get("classes"),"term_id"),o={},d=_.size(a),c=_.extend({},i.default_shipping_class,{term_id:"new-"+d+"-"+Date.now(),editing:!0,newRow:!0});o[c.term_id]=c,t.logChanges(o),n.renderRow(c),e(".wc-shipping-classes-blank-state").remove()},onEditRow:function(i){i.preventDefault(),e(this).closest("tr").addClass("editing"),e(this).closest("tr").find(".view").hide(),e(this).closest("tr").find(".edit").show(),i.data.view.model.trigger("change:classes")},onDeleteRow:function(i){var s=i.data.view,n=s.model,t=_.indexBy(n.get("classes"),"term_id"),a={},o=e(this).closest("tr").data("id");i.preventDefault(),t[o]&&(delete t[o],a[o]=_.extend(a[o]||{},{deleted:"deleted"}),n.set("classes",t),n.logChanges(a)),s.render()},onCancelEditRow:function(i){var s=i.data.view,n=s.model,t=e(this).closest("tr"),a=e(this).closest("tr").data("id"),o=_.indexBy(n.get("classes"),"term_id");i.preventDefault(),n.discardChanges(a),o[a]&&(o[a].editing=!1,t.after(s.rowTemplate(o[a])),s.initRow(o[a])),t.remove()},setUnloadConfirmation:function(){this.needsUnloadConfirm=!0,a.prop("disabled",!1)},clearUnloadConfirmation:function(){this.needsUnloadConfirm=!1,a.attr("disabled","disabled")},unloadConfirmation:function(e){if(e.data.view.needsUnloadConfirm)return e.returnValue=i.strings.unload_confirmation_msg,window.event.returnValue=i.strings.unload_confirmation_msg,i.strings.unload_confirmation_msg},updateModelOnChange:function(i){var s=i.data.view.model,n=e(i.target),t=n.closest("tr").data("id"),a=n.data("attribute"),o=n.val(),d=_.indexBy(s.get("classes"),"term_id"),c={};d[t]&&d[t][a]===o||(c[t]={},c[t][a]=o),s.logChanges(c)}}),r=new c({classes:i.classes}),h=new l({model:r,el:t});h.render()})}(jQuery,shippingClassesLocalizeScript,wp,ajaxurl);
|
||||
!function(e,i,n,t){e(function(){var s=e(".wc-shipping-class-rows"),a=(e(".wc-shipping-class-save"),n.template("wc-shipping-class-row")),o=n.template("wc-shipping-class-row-blank"),c=Backbone.Model.extend({save:function(n){e.post(t+(t.indexOf("?")>0?"&":"?")+"action=woocommerce_shipping_classes_save_changes",{wc_shipping_classes_nonce:i.wc_shipping_classes_nonce,changes:n},this.onSaveResponse,"json")},onSaveResponse:function(e,n){"success"===n&&(e.success?(l.set("classes",e.data.shipping_classes),l.trigger("saved:classes")):e.data?window.alert(e.data):window.alert(i.strings.save_failed)),r.unblock()}}),d=Backbone.View.extend({rowTemplate:a,initialize:function(){this.listenTo(this.model,"saved:classes",this.render),e(document.body).on("click",".wc-shipping-class-add-new",{view:this},this.configureNewShippingClass),e(document.body).on("wc_backbone_modal_response",{view:this},this.onConfigureShippingClassSubmitted),e(document.body).on("wc_backbone_modal_loaded",{view:this},this.onLoadBackboneModal),e(document.body).on("wc_backbone_modal_validation",this.validateFormArguments)},block:function(){e(this.el).block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){e(this.el).unblock()},render:function(){var i=_.indexBy(this.model.get("classes"),"term_id"),n=this;this.$el.empty(),this.unblock(),_.size(i)?(i=_.sortBy(i,function(e){return e.name}),e.each(i,function(e,i){n.renderRow(i)})):n.$el.append(o)},renderRow:function(e){this.$el.append(this.rowTemplate(e)),this.initRow(e)},initRow:function(i){var n=this.$el.find('tr[data-id="'+i.term_id+'"]');n.find("select").each(function(){var n=e(this).data("attribute");e(this).find('option[value="'+i[n]+'"]').prop("selected",!0)}),n.find(".view").show(),n.find(".edit").hide(),n.find(".wc-shipping-class-edit").on("click",{view:this},this.onEditRow),n.find(".wc-shipping-class-delete").on("click",{view:this},this.onDeleteRow)},configureNewShippingClass:function(i){i.preventDefault();const n="new-1-"+Date.now();e(this).WCBackboneModal({template:"wc-shipping-class-configure",variable:{term_id:n,action:"create"},data:{term_id:n,action:"create"}})},onConfigureShippingClassSubmitted:function(e,i,n){if("wc-shipping-class-configure"===i){const i=e.data.view,t=i.model,s=n.term_id.includes("new-1-"),a={...n};s&&(a.newRow=!0),i.block(),t.save({[n.term_id]:a})}},validateFormArguments:function(e,i,n){const t=["name","description"],s=Object.keys(n).every(e=>!t.includes(e)||(Array.isArray(n[e])?n[e].length&&!!n[e][0]:!!n[e])),a=document.getElementById("btn-ok");a.disabled=!s,a.classList.toggle("disabled",!s)},onEditRow:function(i){const n=e(this).closest("tr").data("id"),t=i.data.view.model,s=_.indexBy(t.get("classes"),"term_id")[n];i.preventDefault(),e(this).WCBackboneModal({template:"wc-shipping-class-configure",variable:{action:"edit",...s},data:{action:"edit",...s}})},onLoadBackboneModal:function(i,n){if("wc-shipping-class-configure"===n){const n=e(".wc-backbone-modal-content").data("id"),t=i.data.view.model,s=_.indexBy(t.get("classes"),"term_id")[n];s&&e(".wc-backbone-modal-content").find("select").each(function(){var i=e(this).data("attribute");e(this).find('option[value="'+s[i]+'"]').prop("selected",!0)})}},onDeleteRow:function(i){var n=i.data.view,t=n.model,s=e(this).closest("tr").data("id");i.preventDefault(),n.block(),t.save({[s]:{term_id:s,deleted:"deleted"}})}}),l=new c({classes:i.classes}),r=new d({model:l,el:s});r.render()})}(jQuery,shippingClassesLocalizeScript,wp,ajaxurl);
|
||||
@@ -100,9 +100,22 @@
|
||||
$( document.body ).on( 'click', '.wc-shipping-zone-method-settings', { view: this }, this.onConfigureShippingMethod );
|
||||
$( document.body ).on( 'click', '.wc-shipping-zone-add-method', { view: this }, this.onAddShippingMethod );
|
||||
$( document.body ).on( 'wc_backbone_modal_response', this.onConfigureShippingMethodSubmitted );
|
||||
$( document.body ).on( 'wc_backbone_modal_response', this.onAddShippingMethodSubmitted );
|
||||
$( document.body ).on( 'wc_region_picker_update', this.onUpdateZoneRegionPicker );
|
||||
$( document.body ).on( 'wc_backbone_modal_next_response', this.onAddShippingMethodSubmitted );
|
||||
$( document.body ).on( 'wc_backbone_modal_before_remove', this.onCloseConfigureShippingMethod );
|
||||
$( document.body ).on( 'change', '.wc-shipping-zone-method-selector select', this.onChangeShippingMethodSelector );
|
||||
$( document.body ).on( 'click', '.wc-shipping-zone-postcodes-toggle', this.onTogglePostcodes );
|
||||
$( document.body ).on( 'wc_backbone_modal_validation', { view: this }, this.validateFormArguments );
|
||||
$( document.body ).on( 'wc_backbone_modal_loaded', { view: this }, this.onModalLoaded );
|
||||
},
|
||||
onUpdateZoneRegionPicker: function( event ) {
|
||||
var value = event.detail,
|
||||
attribute = 'zone_locations',
|
||||
changes = {};
|
||||
|
||||
changes[ attribute ] = value;
|
||||
shippingMethodView.model.set( attribute, value );
|
||||
shippingMethodView.model.logChanges( changes );
|
||||
},
|
||||
onUpdateZone: function( event ) {
|
||||
var view = event.data.view,
|
||||
@@ -308,22 +321,26 @@
|
||||
methods = _.indexBy( model.get( 'methods' ), 'instance_id' ),
|
||||
method = methods[ instance_id ];
|
||||
|
||||
// Only load modal if supported
|
||||
// Only load modal if supported.
|
||||
if ( ! method.settings_html ) {
|
||||
return true;
|
||||
}
|
||||
|
||||
event.preventDefault();
|
||||
|
||||
method.settings_html = shippingMethodView.reformatSettingsHTML( method.settings_html );
|
||||
|
||||
$( this ).WCBackboneModal({
|
||||
template : 'wc-modal-shipping-method-settings',
|
||||
variable : {
|
||||
instance_id : instance_id,
|
||||
method : method
|
||||
method : method,
|
||||
status : 'existing'
|
||||
},
|
||||
data : {
|
||||
instance_id : instance_id,
|
||||
method : method
|
||||
method : method,
|
||||
status : 'existing'
|
||||
}
|
||||
});
|
||||
|
||||
@@ -387,10 +404,124 @@
|
||||
|
||||
$( '.wc-shipping-zone-method-selector select' ).trigger( 'change' );
|
||||
},
|
||||
onAddShippingMethodSubmitted: function( event, target, posted_data ) {
|
||||
/**
|
||||
* The settings HTML is controlled and built by the settings api, so in order to refactor the
|
||||
* markup, it needs to be manipulated here.
|
||||
*/
|
||||
reformatSettingsHTML: function( html ) {
|
||||
const formattingFunctions = [
|
||||
this.replaceHTMLTables,
|
||||
this.moveAdvancedCostsHelpTip,
|
||||
this.moveHTMLHelpTips,
|
||||
this.addCurrencySymbol
|
||||
];
|
||||
|
||||
return formattingFunctions.reduce( ( formattedHTML, fn ) => {
|
||||
return fn( formattedHTML );
|
||||
}, html );
|
||||
},
|
||||
moveAdvancedCostsHelpTip: function( html ) {
|
||||
const htmlContent = $( html );
|
||||
const advancedCostsHelpTip = htmlContent.find( '#wc-shipping-advanced-costs-help-text' );
|
||||
advancedCostsHelpTip.addClass( 'wc-shipping-zone-method-fields-help-text' );
|
||||
|
||||
const input = htmlContent.find( '#woocommerce_flat_rate_cost' );
|
||||
const fieldset = input.closest( 'fieldset' );
|
||||
advancedCostsHelpTip.appendTo( fieldset );
|
||||
|
||||
return htmlContent.prop( 'outerHTML' );
|
||||
},
|
||||
addCurrencySymbol: function( html ) {
|
||||
if ( ! window.wc.ShippingCurrencyContext || ! window.wc.ShippingCurrencyNumberFormat ) {
|
||||
return html;
|
||||
}
|
||||
const htmlContent = $( html );
|
||||
const priceInputs = htmlContent.find( '.wc-shipping-modal-price' );
|
||||
const config = window.wc.ShippingCurrencyContext.getCurrencyConfig();
|
||||
const { symbol, symbolPosition } = config;
|
||||
|
||||
priceInputs.addClass( `wc-shipping-currency-size-${ symbol.length }` );
|
||||
priceInputs.addClass( `wc-shipping-currency-position-${ symbolPosition }` );
|
||||
priceInputs.before( `<div class="wc-shipping-zone-method-currency wc-shipping-currency-position-${ symbolPosition }">${ symbol }</div>` );
|
||||
|
||||
priceInputs.each( ( i ) => {
|
||||
const priceInput = $( priceInputs[ i ] );
|
||||
const value = priceInput.attr( 'value' );
|
||||
const formattedValue = window.wc.ShippingCurrencyNumberFormat( config, value );
|
||||
priceInput.attr( 'value', formattedValue );
|
||||
} );
|
||||
|
||||
return htmlContent.prop( 'outerHTML' );
|
||||
},
|
||||
moveHTMLHelpTips: function( html ) {
|
||||
// These help tips aren't moved.
|
||||
const helpTipsToRetain = [ 'woocommerce_flat_rate_cost', 'woocommerce_flat_rate_no_class_cost', 'woocommerce_flat_rate_class_cost_' ];
|
||||
|
||||
const htmlContent = $( html );
|
||||
const labels = htmlContent.find( 'label' );
|
||||
labels.each( ( i ) => {
|
||||
const label = $( labels[ i ] );
|
||||
const helpTip = label.find( '.woocommerce-help-tip' );
|
||||
|
||||
if ( helpTip.length === 0 ) {
|
||||
return;
|
||||
}
|
||||
|
||||
const id = label.attr( 'for' );
|
||||
|
||||
if ( helpTipsToRetain.some( ( tip ) => id.includes( tip ) ) ) {
|
||||
const helpTip = htmlContent.find( `label[for=${ id }] span.woocommerce-help-tip` );
|
||||
helpTip.addClass( 'wc-shipping-visible-help-text' );
|
||||
return;
|
||||
}
|
||||
|
||||
// woocommerce_free_shipping_ignore_discounts gets a helpTip appended to its label. Otherwise, add the text as the last element in the fieldset.
|
||||
if ( id === 'woocommerce_free_shipping_ignore_discounts' ) {
|
||||
const input = htmlContent.find( `#${ id }` );
|
||||
const fieldset = input.closest( 'fieldset' );
|
||||
const inputLabel = fieldset.find( 'label' );
|
||||
inputLabel.append( helpTip );
|
||||
} else {
|
||||
const text = helpTip.data( 'tip' );
|
||||
const input = htmlContent.find( `#${ id }` );
|
||||
const fieldset = input.closest( 'fieldset' );
|
||||
|
||||
if ( fieldset.length && fieldset.find( '.wc-shipping-zone-method-fields-help-text' ).length === 0 ) {
|
||||
fieldset.append( `<div class="wc-shipping-zone-method-fields-help-text">${ text }</div>` );
|
||||
}
|
||||
}
|
||||
|
||||
// Coupon discounts doesn't get a title on Free Shipping.
|
||||
if ( label.text().trim() === 'Coupons discounts' ) {
|
||||
label.text( '' );
|
||||
}
|
||||
|
||||
} );
|
||||
|
||||
return htmlContent.prop( 'outerHTML' );
|
||||
},
|
||||
replaceHTMLTables: function ( html ) {
|
||||
// `<table class="form-table" />` elements added by the Settings API need to be removed.
|
||||
// Modern browsers won't interpret other table elements like `td` not in a `table`, so
|
||||
// Removing the `table` is sufficient.
|
||||
const htmlContent = $( html );
|
||||
const tables = htmlContent.find( 'table.form-table' );
|
||||
|
||||
tables.each( ( i ) => {
|
||||
const table = $( tables[ i ] );
|
||||
const div = $( '<div class="wc-shipping-zone-method-fields" />' );
|
||||
div.html( table.html() );
|
||||
table.replaceWith( div );
|
||||
} );
|
||||
|
||||
return htmlContent.prop('outerHTML');
|
||||
},
|
||||
onAddShippingMethodSubmitted: function( event, target, posted_data, closeModal ) {
|
||||
if ( 'wc-modal-add-shipping-method' === target ) {
|
||||
shippingMethodView.block();
|
||||
|
||||
$('#btn-next').html('<img alt="processing" src="images/wpspin_light.gif" class="waiting" />');
|
||||
|
||||
// Add method to zone via ajax call
|
||||
$.post( ajaxurl + ( ajaxurl.indexOf( '?' ) > 0 ? '&' : '?' ) + 'action=woocommerce_shipping_zone_add_method', {
|
||||
wc_shipping_zones_nonce : data.wc_shipping_zones_nonce,
|
||||
@@ -408,26 +539,144 @@
|
||||
);
|
||||
}
|
||||
}
|
||||
// Trigger save if there are changes, or just re-render
|
||||
if ( _.size( shippingMethodView.model.changes ) ) {
|
||||
shippingMethodView.model.set( 'methods', response.data.methods );
|
||||
shippingMethodView.model.trigger( 'change:methods' );
|
||||
shippingMethodView.model.trigger( 'rerender' );
|
||||
} else {
|
||||
shippingMethodView.model.set( 'methods', response.data.methods );
|
||||
shippingMethodView.model.trigger( 'change:methods' );
|
||||
shippingMethodView.model.trigger( 'saved:methods' );
|
||||
}
|
||||
|
||||
// Avoid triggering a rerender here because we don't want to show the method in the table in case merchant doesn't finish flow.
|
||||
|
||||
shippingMethodView.model.set( 'methods', response.data.methods );
|
||||
|
||||
// Close original modal
|
||||
closeModal();
|
||||
}
|
||||
var instance_id = response.data.instance_id,
|
||||
method = response.data.methods[ instance_id ];
|
||||
|
||||
shippingMethodView.unblock();
|
||||
|
||||
if ( method.settings_html ) {
|
||||
method.settings_html = shippingMethodView.reformatSettingsHTML( method.settings_html );
|
||||
|
||||
// Pop up next modal
|
||||
$( this ).WCBackboneModal({
|
||||
template : 'wc-modal-shipping-method-settings',
|
||||
variable : {
|
||||
instance_id : instance_id,
|
||||
method : method,
|
||||
status : 'new'
|
||||
},
|
||||
data : {
|
||||
instance_id : instance_id,
|
||||
method : method,
|
||||
status : 'new'
|
||||
}
|
||||
});
|
||||
} else {
|
||||
shippingMethodView.model.trigger( 'change:methods' );
|
||||
shippingMethodView.model.trigger( 'saved:methods' );
|
||||
}
|
||||
|
||||
$( document.body ).trigger( 'init_tooltips' );
|
||||
}, 'json' );
|
||||
}
|
||||
},
|
||||
// Free Shipping has hidden field elements depending on data values.
|
||||
possiblyHideFreeShippingRequirements: function( data ) {
|
||||
if ( Object.keys( data ).includes( 'woocommerce_free_shipping_requires' ) ) {
|
||||
const shouldHideRequirements = data.woocommerce_free_shipping_requires === null ||
|
||||
data.woocommerce_free_shipping_requires === '' ||
|
||||
data.woocommerce_free_shipping_requires === 'coupon';
|
||||
|
||||
const select = $( '#woocommerce_free_shipping_requires' );
|
||||
const fieldset = select.closest( 'fieldset' );
|
||||
const allOtherLabelElementsAfter = fieldset.nextAll( 'label' );
|
||||
const allOtherFieldsetElementsAfter = fieldset.nextAll( 'fieldset' );
|
||||
|
||||
allOtherLabelElementsAfter.each( ( i ) => {
|
||||
$( allOtherLabelElementsAfter[ i ] ).css( 'display', shouldHideRequirements ? 'none' : 'block' );
|
||||
} );
|
||||
|
||||
allOtherFieldsetElementsAfter.each( ( i ) => {
|
||||
$( allOtherFieldsetElementsAfter[ i ] ).css( 'display', shouldHideRequirements ? 'none' : 'block' );
|
||||
} );
|
||||
}
|
||||
},
|
||||
onModalLoaded: function( event, target ) {
|
||||
if ( target === 'wc-modal-shipping-method-settings' ) {
|
||||
const select = $( '#woocommerce_free_shipping_requires' );
|
||||
if ( select.length > 0 ) {
|
||||
event.data.view.possiblyHideFreeShippingRequirements( { woocommerce_free_shipping_requires: select.val() } );
|
||||
}
|
||||
|
||||
event.data.view.possiblyAddShippingClassLink( event );
|
||||
}
|
||||
},
|
||||
possiblyAddShippingClassLink: function( event ) {
|
||||
const article = $( 'article.wc-modal-shipping-method-settings' );
|
||||
const shippingClassesCount = article.data( 'shipping-classes-count' );
|
||||
const status = article.data( 'status' );
|
||||
const instance_id = article.data( 'id' );
|
||||
const model = event.data.view.model;
|
||||
const methods = _.indexBy( model.get( 'methods' ), 'instance_id' );
|
||||
const method = methods[ instance_id ];
|
||||
|
||||
if ( method.id === 'flat_rate' && shippingClassesCount === 0 ) {
|
||||
const link = article.find( '.wc-shipping-method-add-class-costs' );
|
||||
link.css( 'display', 'block' );
|
||||
}
|
||||
},
|
||||
validateFormArguments: function( event, target, data ) {
|
||||
if ( target === 'wc-modal-add-shipping-method' ) {
|
||||
if ( data.add_method_id ) {
|
||||
const nextButton = document.getElementById( 'btn-next' );
|
||||
nextButton.disabled = false;
|
||||
nextButton.classList.remove( 'disabled' );
|
||||
}
|
||||
} else if ( target === 'wc-modal-shipping-method-settings' ) {
|
||||
event.data.view.possiblyHideFreeShippingRequirements( data );
|
||||
}
|
||||
},
|
||||
onCloseConfigureShippingMethod: function( event, target, post_data, addButtonCalled ) {
|
||||
if ( target === 'wc-modal-shipping-method-settings' ) {
|
||||
var btnData = $( '#btn-ok' ).data();
|
||||
|
||||
if ( ! addButtonCalled && btnData && btnData.status === 'new' ) {
|
||||
shippingMethodView.block();
|
||||
|
||||
var view = shippingMethodView,
|
||||
model = view.model,
|
||||
methods = _.indexBy( model.get( 'methods' ), 'instance_id' ),
|
||||
changes = {},
|
||||
instance_id = post_data.instance_id;
|
||||
|
||||
// Remove method to zone via ajax call
|
||||
$.post( {
|
||||
url: ajaxurl + ( ajaxurl.indexOf( '?' ) > 0 ? '&' : '?') + 'action=woocommerce_shipping_zone_remove_method',
|
||||
data: {
|
||||
wc_shipping_zones_nonce: data.wc_shipping_zones_nonce,
|
||||
instance_id: instance_id,
|
||||
zone_id: data.zone_id,
|
||||
},
|
||||
success: function( { data } ) {
|
||||
delete methods[instance_id];
|
||||
changes.methods = changes.methods || data.methods;
|
||||
model.set('methods', methods);
|
||||
model.logChanges( changes );
|
||||
view.clearUnloadConfirmation();
|
||||
view.render();
|
||||
shippingMethodView.unblock();
|
||||
},
|
||||
error: function( jqXHR, textStatus, errorThrown ) {
|
||||
window.alert( data.strings.remove_method_failed );
|
||||
shippingMethodView.unblock();
|
||||
},
|
||||
dataType: 'json'
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
onChangeShippingMethodSelector: function() {
|
||||
var description = $( this ).find( 'option:selected' ).data( 'description' );
|
||||
$( this ).parent().find( '.wc-shipping-zone-method-description' ).remove();
|
||||
$( this ).after( '<div class="wc-shipping-zone-method-description">' + description + '</div>' );
|
||||
$( this ).closest( 'article' ).height( $( this ).parent().height() );
|
||||
},
|
||||
onTogglePostcodes: function( event ) {
|
||||
event.preventDefault();
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user