Changeset 1448367
- Timestamp:
- 07/04/2016 07:43:44 AM (10 years ago)
- Location:
- experitus-form
- Files:
-
- 17 added
- 7 edited
-
tags/0.3 (added)
-
tags/0.3/experitus-form.php (added)
-
tags/0.3/includes (added)
-
tags/0.3/includes/controllers (added)
-
tags/0.3/includes/controllers/experitus-admin-controller.php (added)
-
tags/0.3/includes/controllers/experitus-base-controller.php (added)
-
tags/0.3/includes/controllers/experitus-form-controller.php (added)
-
tags/0.3/includes/views (added)
-
tags/0.3/includes/views/_notifications.php (added)
-
tags/0.3/includes/views/admin.php (added)
-
tags/0.3/includes/views/form.php (added)
-
tags/0.3/index.php (added)
-
tags/0.3/readme.txt (added)
-
tags/0.3/web (added)
-
tags/0.3/web/experitus-admin.js (added)
-
tags/0.3/web/experitus-form.css (added)
-
tags/0.3/web/experitus-form.js (added)
-
trunk/experitus-form.php (modified) (4 diffs)
-
trunk/includes/controllers/experitus-admin-controller.php (modified) (6 diffs)
-
trunk/includes/controllers/experitus-base-controller.php (modified) (2 diffs)
-
trunk/includes/controllers/experitus-form-controller.php (modified) (1 diff)
-
trunk/includes/views/form.php (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/web/experitus-form.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
experitus-form/trunk/experitus-form.php
r1445037 r1448367 4 4 Plugin URI: 5 5 Description: This plugins integrates your WP site and Experitus account by installing an orders form 6 Version: 0. 26 Version: 0.3 7 7 Author: Experitus 8 8 */ … … 19 19 define( 'EXPERITUS_ROOT_FILE', __FILE__ ); 20 20 define( 'EXPERITUS_URL', 'https://app.experitus.io/'); 21 21 22 /** 22 23 * Adds options to database … … 30 31 add_option( 'experitus_payments_data' ); 31 32 add_option( 'experitus_options_check' ); 33 add_option( 'experitus_block_dates' ); 32 34 } 33 35 register_activation_hook( __FILE__, 'add_experitus_options' ); … … 44 46 delete_option( 'experitus_payments_data' ); 45 47 delete_option( 'experitus_options_check' ); 48 delete_option( 'experitus_block_dates' ); 46 49 } 47 50 register_uninstall_hook( __FILE__, 'remove_experitus_options' ); -
experitus-form/trunk/includes/controllers/experitus-admin-controller.php
r1445037 r1448367 171 171 esc_attr( 'settings_updated' ), 172 172 __( 'You successfully connected to your Experitus account.' ), 173 ' success'173 'notice-success' 174 174 ); 175 175 } … … 196 196 return; 197 197 update_option( 'experitus_request_attributes', $response['attributes'] ); 198 if ( isset( $response['items'] ) ) 199 update_option( 'experitus_request_items', $response['items'] ); 200 if ( isset( $response['payments_data'] ) ) 201 update_option( 'experitus_payments_data', $response['payments_data'] ); 198 update_option( 'experitus_request_items', $response['items'] ); 199 update_option( 'experitus_payments_data', $response['payments_data'] ); 200 update_option( 'experitus_block_dates', $response['block_dates'] ); 202 201 update_option( 'experitus_options_check', ['outdated' => false, 'time' => time()] ); 203 202 } … … 231 230 esc_attr( 'settings_updated' ), 232 231 __( 'Google reCaptcha credentials added to your form.' ), 233 ' success'232 'notice-success' 234 233 ); 235 234 return $input; … … 323 322 private function reload_form_attributes() { 324 323 if ( !$this->options['experitus_connection_data'] ) { 325 $this->add_notification( 'error', __( 'Please con ect to your Experitus account first!' ) );324 $this->add_notification( 'error', __( 'Please connect to your Experitus account first!' ) ); 326 325 return false; 327 326 } … … 364 363 if ( $this->options['experitus_request_attributes'] != $response['attributes'] ) 365 364 $result = true; 366 if ( isset( $response['items'] ) && $this->options['experitus_request_items'] != $response['items'] || !isset( $response['items'] ) && $this->options['experitus_request_items'] )365 if ( $this->options['experitus_request_items'] != $response['items'] ) 367 366 $result = true; 368 if ( isset( $response['payments_data'] ) && $this->options['experitus_payments_data'] != $response['payments_data'] || !isset( $response['payments_data'] ) && $this->options['experitus_payments_data'] ) 367 if ( $this->options['experitus_payments_data'] != $response['payments_data'] ) 368 $result = true; 369 if ($this->options['experitus_block_dates'] != $response['block_dates'] ) 369 370 $result = true; 370 371 update_option( 'experitus_options_check', ['outdated' => $result, 'time' => time()] ); … … 378 379 if ( !current_user_can( 'manage_options' ) ) 379 380 return false; 381 382 //get options 383 $this->populateOptions(); 380 384 381 385 //check if options outdated -
experitus-form/trunk/includes/controllers/experitus-base-controller.php
r1445037 r1448367 24 24 */ 25 25 public function __construct() { 26 add_shortcode( 'experitus_orders_form', array($this, 'handle_shortcode') ); 27 } 28 29 protected function populateOptions() { 26 30 $this->options['experitus_request_attributes'] = get_option('experitus_request_attributes'); 27 31 $this->options['experitus_connection_data'] = get_option( 'experitus_connection_data' ); … … 31 35 $this->options['experitus_payments_data'] = get_option( 'experitus_payments_data' ); 32 36 $this->options['experitus_options_check'] = get_option( 'experitus_options_check' ); 33 add_shortcode( 'experitus_orders_form', array($this, 'handle_shortcode'));37 $this->options['experitus_block_dates'] = get_option( 'experitus_block_dates' ); 34 38 } 35 39 -
experitus-form/trunk/includes/controllers/experitus-form-controller.php
r1445037 r1448367 21 21 */ 22 22 public function handle_shortcode() { 23 24 //get options 25 $this->populateOptions(); 26 23 27 //add payments 24 28 if ( is_ssl() && $this->options['experitus_request_attributes']['paid'] && $this->options['experitus_payments_data'] && isset( $this->options['experitus_payments_data']['gateway'] ) ) { -
experitus-form/trunk/includes/views/form.php
r1445037 r1448367 46 46 </select> 47 47 48 <?php elseif ( $attribute == 'date' ): ?> 49 <input value="<?php echo get_input_value($attribute); ?>" type="text" id="request_form_<?php echo $attribute; ?>" name="RequestForm[<?php echo $attribute; ?>]" data-block-dates="<?php echo $this->options['experitus_block_dates'] ? $this->options['experitus_block_dates'] : ''; ?>" /> 50 48 51 <?php else: ?> 49 52 <input value="<?php echo get_input_value($attribute); ?>" type="text" id="request_form_<?php echo $attribute; ?>" name="RequestForm[<?php echo $attribute; ?>]" /> -
experitus-form/trunk/readme.txt
r1445049 r1448367 4 4 Requires at least: 4.4.2 5 5 Tested up to: 4.4.2 6 Stable tag: 0. 26 Stable tag: 0.3 7 7 License: GPLv2 or later 8 8 … … 65 65 == Changelog == 66 66 67 = 0.3 Jul 04 2016 = 68 * Added 'block dates' functionality 69 67 70 = 0.2 Jun 27 2016 = 68 71 * Added 'check availability' functionality -
experitus-form/trunk/web/experitus-form.js
r1445037 r1448367 140 140 allowRememberMe:!1 141 141 }); 142 } 143 } 144 145 146 if (jQuery('#request_form_date').length > 0) { 147 jQuery('#request_form_date').datepicker({ 148 dateFormat: 'mm/dd/yy', 149 minDate: 0 150 }); 142 }, 143 initDatePicker: function(field) { 144 var blockDates = field.attr('data-block-dates'); 145 data = { 146 dateFormat: 'mm/dd/yy', 147 minDate: 0 148 }; 149 if (blockDates) { 150 arr = blockDates.split(','); 151 data.beforeShowDay = function(date) { 152 var string = jQuery.datepicker.formatDate('mm/dd/yy', date); 153 return [ arr.indexOf(string) == -1 ] 154 }; 155 } 156 field.datepicker(data); 157 } 158 } 159 160 161 if (jQuery('input[name="RequestForm[date]"]').length > 0) { 162 experitusFormFns.initDatePicker(jQuery('input[name="RequestForm[date]"]')); 151 163 } 152 164 if (jQuery('#request_form_time').length > 0) {
Note: See TracChangeset
for help on using the changeset viewer.