Changeset 2246488
- Timestamp:
- 02/18/2020 11:13:02 PM (6 years ago)
- Location:
- easyreservations/trunk
- Files:
-
- 5 edited
-
assets/js/admin/meta-boxes-reservation.js (modified) (1 diff)
-
assets/js/admin/meta-boxes-reservation.min.js (modified) (1 diff)
-
assets/js/both.js (modified) (1 diff)
-
assets/js/both.min.js (modified) (1 diff)
-
includes/admin/class-er-admin-reservation.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
easyreservations/trunk/assets/js/admin/meta-boxes-reservation.js
r2245284 r2246488 1 jQuery( function ($) {2 3 4 5 6 7 jQuery('li#toplevel_page_reservations, li#toplevel_page_reservations > a').addClass('wp-has-current-submenu wp-menu-open').removeClass('wp-not-current-submenu');1 jQuery( function ( $ ) { 2 /** 3 * Reservations Data Panel 4 */ 5 var er_meta_boxes_reservation = { 6 init: function () { 7 jQuery( 'li#toplevel_page_reservations, li#toplevel_page_reservations > a' ).addClass( 'wp-has-current-submenu wp-menu-open' ).removeClass( 'wp-not-current-submenu' ); 8 8 9 $('#resource').on('change', this.change_resource);10 $('a.remove-from-order').on('click', this.remove_from_order);11 $('a.add-to-order').on('click', this.add_to_order);9 $( '#resource' ).on( 'change', this.change_resource ); 10 $( 'a.remove-from-order' ).on( 'click', this.remove_from_order ); 11 $( 'a.add-to-order' ).on( 'click', this.add_to_order ); 12 12 13 $(document.body)14 .on('er_backbone_modal_loaded', this.backbone.init)15 .on('er_backbone_modal_response', this.backbone.response);13 $( document.body ) 14 .on( 'er_backbone_modal_loaded', this.backbone.init ) 15 .on( 'er_backbone_modal_response', this.backbone.response ); 16 16 17 18 17 er_meta_boxes_reservation.change_resource(); 18 }, 19 19 20 change_resource: function (e) {21 $('.resource-space').css('display', 'none');22 $('.resource-space select').prop("disabled", true);20 change_resource: function ( e ) { 21 $( '.resource-space' ).css( 'display', 'none' ); 22 $( '.resource-space select' ).prop( "disabled", true ); 23 23 24 var container = $('.resource-space.resource-' + $('#resource').val()).css('display', 'block');24 var container = $( '.resource-space.resource-' + $( '#resource' ).val() ).css( 'display', 'block' ); 25 25 26 if ($('#resource').is(':enabled')) { 27 container.find('select').prop("disabled", false); 28 } 26 if ( $( '#resource' ).is( ':enabled' ) ) { 27 container.find( 'select' ).prop( "disabled", false ); 28 container.find( 'select' ).attr( 'name', 'space' ) 29 } 29 30 30 if (e) {31 container.find('select').val(1);32 33 31 if ( e ) { 32 container.find( 'select' ).val( 1 ); 33 } 34 }, 34 35 35 add_to_order: function (e) {36 37 $(this).ERBackboneModal({38 39 });40 36 add_to_order: function ( e ) { 37 e.preventDefault(); 38 $( this ).ERBackboneModal( { 39 template: 'er-modal-add-to-order' 40 } ); 41 }, 41 42 42 remove_from_order: function (e) {43 44 if (window.confirm(easyreservations_admin_meta_boxes.i18n_delete_tax)) {45 $('#easyreservations-reservation-order').block();43 remove_from_order: function ( e ) { 44 e.preventDefault(); 45 if ( window.confirm( easyreservations_admin_meta_boxes.i18n_delete_tax ) ) { 46 $( '#easyreservations-reservation-order' ).block(); 46 47 47 48 reservation_id: $('#object_id').val(),49 order_id: $(this).attr('data-order_id'),50 action:'easyreservations_remove_reservation_from_order',51 security:easyreservations_admin_meta_boxes.receipt_item_nonce52 48 var data = { 49 reservation_id: $( '#object_id' ).val(), 50 order_id: $( this ).attr( 'data-order_id' ), 51 action: 'easyreservations_remove_reservation_from_order', 52 security: easyreservations_admin_meta_boxes.receipt_item_nonce 53 }; 53 54 54 $.ajax({55 url:easyreservations_admin_meta_boxes.ajax_url,56 data:data,57 type:'POST',58 success: function (response) {59 if (response.success) {60 $('#easyreservations-reservation-order').find('.inside').empty();61 $('#easyreservations-reservation-order').find('.inside').append(response.data.html);62 63 window.alert(response.data.error);64 65 $('#easyreservations-reservation-order').unblock();66 67 68 69 });70 71 72 55 $.ajax( { 56 url: easyreservations_admin_meta_boxes.ajax_url, 57 data: data, 58 type: 'POST', 59 success: function ( response ) { 60 if ( response.success ) { 61 $( '#easyreservations-reservation-order' ).find( '.inside' ).empty(); 62 $( '#easyreservations-reservation-order' ).find( '.inside' ).append( response.data.html ); 63 } else { 64 window.alert( response.data.error ); 65 } 66 $( '#easyreservations-reservation-order' ).unblock(); 67 }, 68 complete: function () { 69 } 70 } ); 71 } 72 return false; 73 }, 73 74 74 75 init: function (e, target) {76 if ('er-modal-add-to-order' === target) {77 $(document.body).trigger('er-enhanced-select-init');78 79 80 response: function (e, target, data) {81 if ('er-modal-add-to-order' === target) {82 83 if(data.order_id){84 $('#easyreservations-reservation-order').block();75 backbone: { 76 init: function ( e, target ) { 77 if ( 'er-modal-add-to-order' === target ) { 78 $( document.body ).trigger( 'er-enhanced-select-init' ); 79 } 80 }, 81 response: function ( e, target, data ) { 82 if ( 'er-modal-add-to-order' === target ) { 83 // Build array of data. 84 if ( data.order_id ) { 85 $( '#easyreservations-reservation-order' ).block(); 85 86 86 87 reservation_id: $('#object_id').val(),88 order_id:data.order_id,89 reservation:1,90 action:'easyreservations_add_reservation_to_order',91 security:easyreservations_admin_meta_boxes.receipt_item_nonce92 87 var data = { 88 reservation_id: $( '#object_id' ).val(), 89 order_id: data.order_id, 90 reservation: 1, 91 action: 'easyreservations_add_reservation_to_order', 92 security: easyreservations_admin_meta_boxes.receipt_item_nonce 93 }; 93 94 94 $.ajax({95 url:easyreservations_admin_meta_boxes.ajax_url,96 data:data,97 type:'POST',98 success: function (response) {99 if (response.success) {100 $('#easyreservations-reservation-order').find('.inside').empty();101 $('#easyreservations-reservation-order').find('.inside').append(response.data.html);102 103 window.alert(response.data.error);104 105 $('#easyreservations-reservation-order').unblock();106 107 108 109 });110 111 112 113 114 95 $.ajax( { 96 url: easyreservations_admin_meta_boxes.ajax_url, 97 data: data, 98 type: 'POST', 99 success: function ( response ) { 100 if ( response.success ) { 101 $( '#easyreservations-reservation-order' ).find( '.inside' ).empty(); 102 $( '#easyreservations-reservation-order' ).find( '.inside' ).append( response.data.html ); 103 } else { 104 window.alert( response.data.error ); 105 } 106 $( '#easyreservations-reservation-order' ).unblock(); 107 }, 108 complete: function () { 109 } 110 } ); 111 } 112 } 113 }, 114 } 115 }; 115 116 116 117 } );117 er_meta_boxes_reservation.init(); 118 } ); -
easyreservations/trunk/assets/js/admin/meta-boxes-reservation.min.js
r2245284 r2246488 1 jQuery(function(b){var a={init:function(){jQuery("li#toplevel_page_reservations, li#toplevel_page_reservations > a").addClass("wp-has-current-submenu wp-menu-open").removeClass("wp-not-current-submenu");b("#resource").on("change",this.change_resource);b("a.remove-from-order").on("click",this.remove_from_order);b("a.add-to-order").on("click",this.add_to_order);b(document.body).on("er_backbone_modal_loaded",this.backbone.init).on("er_backbone_modal_response",this.backbone.response);a.change_resource()},change_resource:function(d){b(".resource-space").css("display","none");b(".resource-space select").prop("disabled",true);var c=b(".resource-space.resource-"+b("#resource").val()).css("display","block");if(b("#resource").is(":enabled")){c.find("select").prop("disabled",false) }if(d){c.find("select").val(1)}},add_to_order:function(c){c.preventDefault();b(this).ERBackboneModal({template:"er-modal-add-to-order"})},remove_from_order:function(d){d.preventDefault();if(window.confirm(easyreservations_admin_meta_boxes.i18n_delete_tax)){b("#easyreservations-reservation-order").block();var c={reservation_id:b("#object_id").val(),order_id:b(this).attr("data-order_id"),action:"easyreservations_remove_reservation_from_order",security:easyreservations_admin_meta_boxes.receipt_item_nonce};b.ajax({url:easyreservations_admin_meta_boxes.ajax_url,data:c,type:"POST",success:function(e){if(e.success){b("#easyreservations-reservation-order").find(".inside").empty();b("#easyreservations-reservation-order").find(".inside").append(e.data.html)}else{window.alert(e.data.error)}b("#easyreservations-reservation-order").unblock()},complete:function(){}})}return false},backbone:{init:function(d,c){if("er-modal-add-to-order"===c){b(document.body).trigger("er-enhanced-select-init")}},response:function(f,d,c){if("er-modal-add-to-order"===d){if(c.order_id){b("#easyreservations-reservation-order").block();var c={reservation_id:b("#object_id").val(),order_id:c.order_id,reservation:1,action:"easyreservations_add_reservation_to_order",security:easyreservations_admin_meta_boxes.receipt_item_nonce};b.ajax({url:easyreservations_admin_meta_boxes.ajax_url,data:c,type:"POST",success:function(e){if(e.success){b("#easyreservations-reservation-order").find(".inside").empty();b("#easyreservations-reservation-order").find(".inside").append(e.data.html)}else{window.alert(e.data.error)}b("#easyreservations-reservation-order").unblock()},complete:function(){}})}}}}};a.init()});1 jQuery(function(b){var a={init:function(){jQuery("li#toplevel_page_reservations, li#toplevel_page_reservations > a").addClass("wp-has-current-submenu wp-menu-open").removeClass("wp-not-current-submenu");b("#resource").on("change",this.change_resource);b("a.remove-from-order").on("click",this.remove_from_order);b("a.add-to-order").on("click",this.add_to_order);b(document.body).on("er_backbone_modal_loaded",this.backbone.init).on("er_backbone_modal_response",this.backbone.response);a.change_resource()},change_resource:function(d){b(".resource-space").css("display","none");b(".resource-space select").prop("disabled",true);var c=b(".resource-space.resource-"+b("#resource").val()).css("display","block");if(b("#resource").is(":enabled")){c.find("select").prop("disabled",false);c.find("select").attr("name","space")}if(d){c.find("select").val(1)}},add_to_order:function(c){c.preventDefault();b(this).ERBackboneModal({template:"er-modal-add-to-order"})},remove_from_order:function(d){d.preventDefault();if(window.confirm(easyreservations_admin_meta_boxes.i18n_delete_tax)){b("#easyreservations-reservation-order").block();var c={reservation_id:b("#object_id").val(),order_id:b(this).attr("data-order_id"),action:"easyreservations_remove_reservation_from_order",security:easyreservations_admin_meta_boxes.receipt_item_nonce};b.ajax({url:easyreservations_admin_meta_boxes.ajax_url,data:c,type:"POST",success:function(e){if(e.success){b("#easyreservations-reservation-order").find(".inside").empty();b("#easyreservations-reservation-order").find(".inside").append(e.data.html)}else{window.alert(e.data.error)}b("#easyreservations-reservation-order").unblock()},complete:function(){}})}return false},backbone:{init:function(d,c){if("er-modal-add-to-order"===c){b(document.body).trigger("er-enhanced-select-init")}},response:function(f,d,c){if("er-modal-add-to-order"===d){if(c.order_id){b("#easyreservations-reservation-order").block();var c={reservation_id:b("#object_id").val(),order_id:c.order_id,reservation:1,action:"easyreservations_add_reservation_to_order",security:easyreservations_admin_meta_boxes.receipt_item_nonce};b.ajax({url:easyreservations_admin_meta_boxes.ajax_url,data:c,type:"POST",success:function(e){if(e.success){b("#easyreservations-reservation-order").find(".inside").empty();b("#easyreservations-reservation-order").find(".inside").append(e.data.html)}else{window.alert(e.data.error)}b("#easyreservations-reservation-order").unblock()},complete:function(){}})}}}}};a.init()}); -
easyreservations/trunk/assets/js/both.js
r2245284 r2246488 30 30 31 31 function easyStringToDate(string) { 32 var regex = /(?<day>\d{2}).(?<month>\d{2}).(?<year>\d{4})/;33 if (er_both_params.date_format == 'Y/m/d') regex = /(?<year>\d{4})\/(?<month>\d{2})\/(?<day>\d{2})/;34 else if (er_both_params.date_format == 'm/d/Y') regex = /(?<month>\d{2})\/(?<day>\d{2})\/(?<year>\d{4})/;35 else if (er_both_params.date_format == 'Y-m-d') regex = /(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})/;36 else if (er_both_params.date_format == 'd-m-Y') regex = /(?<day>\d{2})-(?<month>\d{2})-(?<year>\d{4})/;32 var regex = "/(?<day>\d{2}).(?<month>\d{2}).(?<year>\d{4})/"; 33 if (er_both_params.date_format == 'Y/m/d') regex = "/(?<year>\d{4})\/(?<month>\d{2})\/(?<day>\d{2})/"; 34 else if (er_both_params.date_format == 'm/d/Y') regex = "/(?<month>\d{2})\/(?<day>\d{2})\/(?<year>\d{4})/"; 35 else if (er_both_params.date_format == 'Y-m-d') regex = "/(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})/"; 36 else if (er_both_params.date_format == 'd-m-Y') regex = "/(?<day>\d{2})-(?<month>\d{2})-(?<year>\d{4})/"; 37 37 38 38 var hour = 0; -
easyreservations/trunk/assets/js/both.min.js
r2245284 r2246488 1 function easyFormatDate(c,f){if(!f){f=er_both_params.date_format}var d=c.getYear();if(d<999){d+=1900}var e=easyAddZero(c.getMonth()+1);var b=easyAddZero(c.getDate());var a=c.getHours();var g=easyAddZero(c.getMinutes());f=f.replace("Y",d);f=f.replace("m",e);f=f.replace("d",b);f=easyFormatTime(a,g,f);return f}function easyFormatTime(a,c,b){if(!b){b=er_both_params.time_format}b=b.replace("H",easyAddZero(a));b=b.replace("h",a%12?easyAddZero(a%12):12);b=b.replace("a",a>=12?"pm":"am");b=b.replace("A",a>=12?"PM":"AM");b=b.replace("i",c);return b}function easyStringToDate(c){var f= /(?<day>\d{2}).(?<month>\d{2}).(?<year>\d{4})/;if(er_both_params.date_format=="Y/m/d"){f=/(?<year>\d{4})\/(?<month>\d{2})\/(?<day>\d{2})/}else{if(er_both_params.date_format=="m/d/Y"){f=/(?<month>\d{2})\/(?<day>\d{2})\/(?<year>\d{4})/}else{if(er_both_params.date_format=="Y-m-d"){f=/(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})/}else{if(er_both_params.date_format=="d-m-Y"){f=/(?<day>\d{2})-(?<month>\d{2})-(?<year>\d{4})/}}}}var a=0;var g=0;var e=c.split(" ");var d=f.exec(e[0]);if(e[1]){var b=e[1].split(":");a=parseInt(b[0],10);g=parseInt(b[1],10);if(e[2]){a=a*2}}return new Date(parseInt(d.groups.year,10),parseInt(d.groups.month,10)-1,parseInt(d.groups.day,10),a,g,0,0)}function easyAddZero(a){a=parseInt(a,10);if(a<10){a="0"+a}return a};1 function easyFormatDate(c,f){if(!f){f=er_both_params.date_format}var d=c.getYear();if(d<999){d+=1900}var e=easyAddZero(c.getMonth()+1);var b=easyAddZero(c.getDate());var a=c.getHours();var g=easyAddZero(c.getMinutes());f=f.replace("Y",d);f=f.replace("m",e);f=f.replace("d",b);f=easyFormatTime(a,g,f);return f}function easyFormatTime(a,c,b){if(!b){b=er_both_params.time_format}b=b.replace("H",easyAddZero(a));b=b.replace("h",a%12?easyAddZero(a%12):12);b=b.replace("a",a>=12?"pm":"am");b=b.replace("A",a>=12?"PM":"AM");b=b.replace("i",c);return b}function easyStringToDate(c){var f="/(?<day>\d{2}).(?<month>\d{2}).(?<year>\d{4})/";if(er_both_params.date_format=="Y/m/d"){f="/(?<year>\d{4})/(?<month>\d{2})/(?<day>\d{2})/"}else{if(er_both_params.date_format=="m/d/Y"){f="/(?<month>\d{2})/(?<day>\d{2})/(?<year>\d{4})/"}else{if(er_both_params.date_format=="Y-m-d"){f="/(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})/"}else{if(er_both_params.date_format=="d-m-Y"){f="/(?<day>\d{2})-(?<month>\d{2})-(?<year>\d{4})/"}}}}var a=0;var g=0;var e=c.split(" ");var d=f.exec(e[0]);if(e[1]){var b=e[1].split(":");a=parseInt(b[0],10);g=parseInt(b[1],10);if(e[2]){a=a*2}}return new Date(parseInt(d.groups.year,10),parseInt(d.groups.month,10)-1,parseInt(d.groups.day,10),a,g,0,0)}function easyAddZero(a){a=parseInt(a,10);if(a<10){a="0"+a}return a}; -
easyreservations/trunk/includes/admin/class-er-admin-reservation.php
r2245284 r2246488 70 70 ER_Meta_Box_Custom_Data::save( $reservation_id ); 71 71 ER_Meta_Box_Receipt_Items::save( $reservation_id, true ); 72 } elseif( isset( $_POST['reservation_status'] )){ 73 $reservation = ER()->reservation_manager()->get( $reservation_id ); 74 75 $reservation->update_status( sanitize_key( $_POST['reservation_status'] ), '', true ); 76 77 ER_Admin_Notices::add_temporary_error( __( 'Status of reservation changed.', 'easyReservations' ) ); 72 78 } elseif( isset( $_POST['er_reservation_action'] )){ 73 79 ER_Meta_Box_Reservation_Actions::save( $reservation_id );
Note: See TracChangeset
for help on using the changeset viewer.