Changeset 2916690
- Timestamp:
- 05/24/2023 07:50:07 AM (3 years ago)
- Location:
- wilapp
- Files:
-
- 2 added
- 4 deleted
- 10 edited
- 1 copied
-
tags/1.2.0 (copied) (copied from wilapp/trunk)
-
tags/1.2.0/.github (deleted)
-
tags/1.2.0/.wordpress-org (deleted)
-
tags/1.2.0/includes/assets/loading.svg (added)
-
tags/1.2.0/includes/assets/wilapp-app.js (modified) (3 diffs)
-
tags/1.2.0/includes/assets/wilapp-frontend.css (modified) (6 diffs)
-
tags/1.2.0/includes/class-wilapp-wizard.php (modified) (5 diffs)
-
tags/1.2.0/readme.txt (modified) (1 diff)
-
tags/1.2.0/wilapp.php (modified) (3 diffs)
-
trunk/.github (deleted)
-
trunk/.wordpress-org (deleted)
-
trunk/includes/assets/loading.svg (added)
-
trunk/includes/assets/wilapp-app.js (modified) (3 diffs)
-
trunk/includes/assets/wilapp-frontend.css (modified) (6 diffs)
-
trunk/includes/class-wilapp-wizard.php (modified) (5 diffs)
-
trunk/readme.txt (modified) (1 diff)
-
trunk/wilapp.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
wilapp/tags/1.2.0/includes/assets/wilapp-app.js
r2864737 r2916690 4 4 var loadFunction = function( e ) { 5 5 // AJAX request. 6 let cat_id = this.getAttribute('data-cat-id'); 7 let service_id = this.getAttribute('data-service-id'); 8 let day = this.getAttribute('data-appointment-weekday'); 9 let hour = this.getAttribute('data-appointment-hour'); 10 let worker = this.getAttribute('data-worker-id'); 11 let page = parseInt( this.closest('.wizard-fieldset').getAttribute('data-page') ) + 1; 6 let cat_id = this.getAttribute('data-cat-id'); 7 let service_id = this.getAttribute('data-service-id'); 8 let day = this.getAttribute('data-appointment-weekday'); 9 let hour = this.getAttribute('data-appointment-hour'); 10 let worker = this.getAttribute('data-worker-id'); 11 let wizard_step = this.closest('.wizard-fieldset'); 12 let page = parseInt( this.closest('.wizard-fieldset').getAttribute('data-page') ) + 1; 12 13 13 14 fetch( AjaxVarStep.url, { … … 80 81 let worker = e.target.closest('.wizard-fieldset').getAttribute('data-worker'); 81 82 83 // Loader 84 loader = document.querySelector('.wilapp-wizard .wilapp-loader'); 85 loader.style.display = 'block'; 86 buttonBack = document.getElementById('wilapp-step-back'); 87 buttonBack.disabled = true; 88 buttonSubmit = document.getElementById('wilapp-submit'); 89 buttonSubmit.disabled = true; 90 82 91 fetch( AjaxVarSubmit.url, { 83 92 method: 'POST', … … 93 102 toggleFieldSet( e.target ); 94 103 document.getElementById('wilapp-result-appointment').innerHTML = result.data; 104 loader.style.display = 'none'; 105 buttonBack.disabled = false; 106 buttonSubmit.disabled = false; 95 107 }) 96 108 .catch(err => console.log(err)); -
wilapp/tags/1.2.0/includes/assets/wilapp-frontend.css
r2825205 r2916690 79 79 } 80 80 81 .wilapp-wizard .wilapp-loader { 82 background: url( 'loading.svg' ) no-repeat center center; 83 width: 100%; 84 height: 200px; 85 position: absolute; 86 z-index: 100; 87 display: none; 88 } 89 81 90 body.woocommerce-cart .wilapp-wizard { 82 91 margin-top: 0px; … … 108 117 list-style: none; 109 118 margin: 0; 110 padding: 12px;119 padding: 0 12px; 111 120 border-bottom: 1px solid #e9ecef; 112 121 cursor: pointer; … … 194 203 -webkit-appearance: none; 195 204 -moz-appearance: none; 196 -ms-appearance: none;197 -o-appearance: none;198 205 appearance: none; 199 206 background-color: #dddddd; … … 230 237 231 238 .form-wizard .wizard-form-radio input[type="radio"]:checked::after { 232 content: "";233 display: inline-block;234 webkit-animation: click-radio-wave 0.65s;235 -moz-animation: click-radio-wave 0.65s;236 239 animation: click-radio-wave 0.65s; 237 240 background: #000000; … … 297 300 .form-wizard .wizard-fieldset.show { 298 301 display: block; 302 position: relative; 299 303 } 300 304 … … 474 478 display: none; 475 479 } 476 477 /* Spinner */478 .cmk-loader {479 display: inline-block;480 position: relative;481 width: 20px;482 height: 20px;483 margin-left: 5px;484 }485 486 .cmk-loader div {487 box-sizing: border-box;488 display: block;489 position: absolute;490 width: 14px;491 height: 14px;492 margin: 8px 0;493 border: 2px solid #ffffff;494 border-radius: 50%;495 animation: cmk-loader 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;496 border-color: #ffffff transparent transparent transparent;497 }498 499 .btn-yellow .cmk-loader div {500 border-color: #ffffff transparent transparent transparent;501 }502 503 .cmk-loader div:nth-child(1) {504 animation-delay: -0.45s;505 }506 .cmk-loader div:nth-child(2) {507 animation-delay: -0.3s;508 }509 .cmk-loader div:nth-child(3) {510 animation-delay: -0.15s;511 }512 @keyframes cmk-loader {513 0% {514 transform: rotate(0deg);515 }516 100% {517 transform: rotate(360deg);518 }519 } -
wilapp/tags/1.2.0/includes/class-wilapp-wizard.php
r2864737 r2916690 19 19 */ 20 20 class WilApp_Wizard { 21 /** 22 * Options 23 * 24 * @var array 25 */ 26 private $wilapp_options; 21 27 22 28 /** … … 95 101 $login_result = $helpers_wilapp->login(); 96 102 if ( 'error' === $login_result['status'] ) { 97 echo 'error';98 103 return; 99 104 } … … 173 178 $html .= '<button id="wilapp-step-back" class="icon-left-open">' . esc_html__( 'Back', 'wilapp' ) . '</button>'; 174 179 $html .= '<h3>' . __( 'New Appointmet', 'wilapp' ) . '</h3>'; 180 $html .= '<div class="wilapp-loader"></div>'; 175 181 176 182 // First and Last name. … … 208 214 // GDPR. 209 215 $html .= '<div class="form-group focus-input form-conditions">'; 210 $html .= '<label for=" gdpr"><input type="checkbox" class="form-check wizard-required" id="wilapp-gdpr"';216 $html .= '<label for="wilapp-gdpr"><input type="checkbox" class="form-check wizard-required" id="wilapp-gdpr"'; 211 217 $html .= '>'; 212 218 $html .= sprintf( … … 233 239 * --------------------------- */ 234 240 $html .= '<fieldset class="wizard-fieldset" data-page="7">'; 241 $html .= '<div class="wilapp-loader"></div>'; 235 242 $html .= '<div id="wilapp-result-appointment"></div>'; 236 243 $html .= '</fieldset>'; -
wilapp/tags/1.2.0/readme.txt
r2864737 r2916690 43 43 == Changelog == 44 44 45 = 1.2.0 = 46 * Created loader while running the wizard. 47 45 48 = 1.1.0 = 46 * Fixed: schedules and workers.49 * Fixed: schedules and workers. 47 50 * Fixed: Load images from workers. 48 51 -
wilapp/tags/1.2.0/wilapp.php
r2864737 r2916690 4 4 * Plugin URI: https://wilapp.com 5 5 * Description: Make appointments for your shop with Wilapp. 6 * Version: 1. 1.06 * Version: 1.2.0 7 7 * Author: wilapp 8 8 * Author URI: https://close.technology … … 26 26 defined( 'ABSPATH' ) || die( 'No script kiddies please!' ); 27 27 28 define( 'WILAPP_VERSION', '1. 1.0' );28 define( 'WILAPP_VERSION', '1.2.0' ); 29 29 define( 'WILAPP_PLUGIN', __FILE__ ); 30 30 define( 'WILAPP_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); … … 42 42 } 43 43 44 /**45 * # Includes46 * ---------------------------------------------------------------------------------------------------- */47 44 require_once WILAPP_PLUGIN_PATH . 'includes/class-helpers-wilapp.php'; 48 45 require_once WILAPP_PLUGIN_PATH . 'includes/class-wilapp-admin-settings.php'; -
wilapp/trunk/includes/assets/wilapp-app.js
r2864737 r2916690 4 4 var loadFunction = function( e ) { 5 5 // AJAX request. 6 let cat_id = this.getAttribute('data-cat-id'); 7 let service_id = this.getAttribute('data-service-id'); 8 let day = this.getAttribute('data-appointment-weekday'); 9 let hour = this.getAttribute('data-appointment-hour'); 10 let worker = this.getAttribute('data-worker-id'); 11 let page = parseInt( this.closest('.wizard-fieldset').getAttribute('data-page') ) + 1; 6 let cat_id = this.getAttribute('data-cat-id'); 7 let service_id = this.getAttribute('data-service-id'); 8 let day = this.getAttribute('data-appointment-weekday'); 9 let hour = this.getAttribute('data-appointment-hour'); 10 let worker = this.getAttribute('data-worker-id'); 11 let wizard_step = this.closest('.wizard-fieldset'); 12 let page = parseInt( this.closest('.wizard-fieldset').getAttribute('data-page') ) + 1; 12 13 13 14 fetch( AjaxVarStep.url, { … … 80 81 let worker = e.target.closest('.wizard-fieldset').getAttribute('data-worker'); 81 82 83 // Loader 84 loader = document.querySelector('.wilapp-wizard .wilapp-loader'); 85 loader.style.display = 'block'; 86 buttonBack = document.getElementById('wilapp-step-back'); 87 buttonBack.disabled = true; 88 buttonSubmit = document.getElementById('wilapp-submit'); 89 buttonSubmit.disabled = true; 90 82 91 fetch( AjaxVarSubmit.url, { 83 92 method: 'POST', … … 93 102 toggleFieldSet( e.target ); 94 103 document.getElementById('wilapp-result-appointment').innerHTML = result.data; 104 loader.style.display = 'none'; 105 buttonBack.disabled = false; 106 buttonSubmit.disabled = false; 95 107 }) 96 108 .catch(err => console.log(err)); -
wilapp/trunk/includes/assets/wilapp-frontend.css
r2825205 r2916690 79 79 } 80 80 81 .wilapp-wizard .wilapp-loader { 82 background: url( 'loading.svg' ) no-repeat center center; 83 width: 100%; 84 height: 200px; 85 position: absolute; 86 z-index: 100; 87 display: none; 88 } 89 81 90 body.woocommerce-cart .wilapp-wizard { 82 91 margin-top: 0px; … … 108 117 list-style: none; 109 118 margin: 0; 110 padding: 12px;119 padding: 0 12px; 111 120 border-bottom: 1px solid #e9ecef; 112 121 cursor: pointer; … … 194 203 -webkit-appearance: none; 195 204 -moz-appearance: none; 196 -ms-appearance: none;197 -o-appearance: none;198 205 appearance: none; 199 206 background-color: #dddddd; … … 230 237 231 238 .form-wizard .wizard-form-radio input[type="radio"]:checked::after { 232 content: "";233 display: inline-block;234 webkit-animation: click-radio-wave 0.65s;235 -moz-animation: click-radio-wave 0.65s;236 239 animation: click-radio-wave 0.65s; 237 240 background: #000000; … … 297 300 .form-wizard .wizard-fieldset.show { 298 301 display: block; 302 position: relative; 299 303 } 300 304 … … 474 478 display: none; 475 479 } 476 477 /* Spinner */478 .cmk-loader {479 display: inline-block;480 position: relative;481 width: 20px;482 height: 20px;483 margin-left: 5px;484 }485 486 .cmk-loader div {487 box-sizing: border-box;488 display: block;489 position: absolute;490 width: 14px;491 height: 14px;492 margin: 8px 0;493 border: 2px solid #ffffff;494 border-radius: 50%;495 animation: cmk-loader 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;496 border-color: #ffffff transparent transparent transparent;497 }498 499 .btn-yellow .cmk-loader div {500 border-color: #ffffff transparent transparent transparent;501 }502 503 .cmk-loader div:nth-child(1) {504 animation-delay: -0.45s;505 }506 .cmk-loader div:nth-child(2) {507 animation-delay: -0.3s;508 }509 .cmk-loader div:nth-child(3) {510 animation-delay: -0.15s;511 }512 @keyframes cmk-loader {513 0% {514 transform: rotate(0deg);515 }516 100% {517 transform: rotate(360deg);518 }519 } -
wilapp/trunk/includes/class-wilapp-wizard.php
r2864737 r2916690 19 19 */ 20 20 class WilApp_Wizard { 21 /** 22 * Options 23 * 24 * @var array 25 */ 26 private $wilapp_options; 21 27 22 28 /** … … 95 101 $login_result = $helpers_wilapp->login(); 96 102 if ( 'error' === $login_result['status'] ) { 97 echo 'error';98 103 return; 99 104 } … … 173 178 $html .= '<button id="wilapp-step-back" class="icon-left-open">' . esc_html__( 'Back', 'wilapp' ) . '</button>'; 174 179 $html .= '<h3>' . __( 'New Appointmet', 'wilapp' ) . '</h3>'; 180 $html .= '<div class="wilapp-loader"></div>'; 175 181 176 182 // First and Last name. … … 208 214 // GDPR. 209 215 $html .= '<div class="form-group focus-input form-conditions">'; 210 $html .= '<label for=" gdpr"><input type="checkbox" class="form-check wizard-required" id="wilapp-gdpr"';216 $html .= '<label for="wilapp-gdpr"><input type="checkbox" class="form-check wizard-required" id="wilapp-gdpr"'; 211 217 $html .= '>'; 212 218 $html .= sprintf( … … 233 239 * --------------------------- */ 234 240 $html .= '<fieldset class="wizard-fieldset" data-page="7">'; 241 $html .= '<div class="wilapp-loader"></div>'; 235 242 $html .= '<div id="wilapp-result-appointment"></div>'; 236 243 $html .= '</fieldset>'; -
wilapp/trunk/readme.txt
r2864737 r2916690 43 43 == Changelog == 44 44 45 = 1.2.0 = 46 * Created loader while running the wizard. 47 45 48 = 1.1.0 = 46 * Fixed: schedules and workers.49 * Fixed: schedules and workers. 47 50 * Fixed: Load images from workers. 48 51 -
wilapp/trunk/wilapp.php
r2864737 r2916690 4 4 * Plugin URI: https://wilapp.com 5 5 * Description: Make appointments for your shop with Wilapp. 6 * Version: 1. 1.06 * Version: 1.2.0 7 7 * Author: wilapp 8 8 * Author URI: https://close.technology … … 26 26 defined( 'ABSPATH' ) || die( 'No script kiddies please!' ); 27 27 28 define( 'WILAPP_VERSION', '1. 1.0' );28 define( 'WILAPP_VERSION', '1.2.0' ); 29 29 define( 'WILAPP_PLUGIN', __FILE__ ); 30 30 define( 'WILAPP_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); … … 42 42 } 43 43 44 /**45 * # Includes46 * ---------------------------------------------------------------------------------------------------- */47 44 require_once WILAPP_PLUGIN_PATH . 'includes/class-helpers-wilapp.php'; 48 45 require_once WILAPP_PLUGIN_PATH . 'includes/class-wilapp-admin-settings.php';
Note: See TracChangeset
for help on using the changeset viewer.