Changeset 2731004

Timestamp:

05/25/2022 05:37:28 PM (4 years ago)

Author:

registerone

Message:

v3.5.2

Location:

registerone-event-forms/trunk

Files:

• admin/classes/RegisteroneShortcodes.php (modified) (14 diffs)
• readme.txt (modified) (2 diffs)
• registerone-wordpress-client.php (modified) (1 diff)

registerone-event-forms/trunk/admin/classes/RegisteroneShortcodes.php

@@ -461 +461 @@
 
                         }elseif($this->current_screen == "amenities" && isset( $_GET['ok'] )){
+
                             $form_key = $attributes['form_key'];
                             $form_key .= "_".sanitize_text_field($_GET['ok']);
@@ -510 +511 @@
 
         }elseif($this->current_screen == "amenities" && empty($_GET['pk']) && isset($_SESSION['temp_pk'])){
+            $request_url .= "/" . $_SESSION['temp_pk'] . ".temp_pk";
+
+        }elseif($this->current_screen == "badges" && empty($_GET['pk']) && isset($_SESSION['temp_pk'])){
             $request_url .= "/" . $_SESSION['temp_pk'] . ".temp_pk";
         }
@@ -737 +741 @@
 
             case "amenities":
+                return $this->_amenities_screen($formData);
+                break;
+
+            case "badges":
                 return $this->_amenities_screen($formData);
                 break;
@@ -1614 +1622 @@
 
             case "amenities":
+                // die("amenities");
 
                 // inject api_token into profile key
@@ -1625 +1634 @@
 
                 if(isset($data['amenity_extra'])){
-                    //print_r($responses); die;
+                    // print_r($responses); die;
                 }
 
                 $redirect_url = $root;
 
-                if($responses['code'] == 201 || $responses['code'] == 200) {
+                if($responses['code'] == 202 ||
+                    $responses['code'] == 201 ||
+                    $responses['code'] == 200) {
 
                     if(isset($responses['add_extra_fields'])){
                         $extra_amenity_id = $responses['add_extra_fields'][0];
-                        $redirect_url .= "?amenities&extra={$extra_amenity_id}";
+                        $redirect_url .= "?badges&extra={$extra_amenity_id}";
 
                     }else{
@@ -1641 +1652 @@
                         $key_pos = (int)array_search($data['dwc_screen_name'],$next_step_a);
                         $key_pos++;
+
+                        // badge post returns 202
+                        if($responses['code'] == 202){
+                            $key_pos++;
+                        }
 
                         $redirect_url = $root;
@@ -2345 +2361 @@
             }
 
+        }elseif(isset( $_GET['badges'])){
+            return "badges";
+
         }elseif(isset( $_GET['terms'])) {
             if(isset( $_GET['signature']) && $_GET['signature'] != '') {
@@ -2608 +2627 @@
         $form_attributes_a = json_decode($this->event_attributes, true);
 
-        $form = $this->_set_application_steps("amenities", $form, $formData, $raw_output);
+        // $form = $this->_set_application_steps("amenities", $form, $formData, $raw_output);
 
         if(isset( $_GET['extra']) && $_GET['extra'] != null){
+            $form = $this->_set_application_steps("badges", $form, $formData, $raw_output);
             $form = $this->_create_extra_screen_fields($formData, $form, $form_attributes_a);
         }else{
+            $form = $this->_set_application_steps("amenities", $form, $formData, $raw_output);
             $form = $this->_create_amenities_screen_fields($formData, $form);
         }
@@ -8585 +8606 @@
                     break;
 
+                case "badges":
+                    if($current < $self) return "";
+                    if($current == $self) return "active";
+                    if($current > $self) {
+
+                        $attributes = json_decode($this->event_attributes, true);
+
+                        if(isset( $_GET['pk']) && $_GET['pk'] != '') {
+                            /*
+                            'uploads'
+                            'terms'
+                            'map'
+                            'fee'
+                             * */
+                            if(in_array('map', $attributes['error_details_a'])){
+                                return "error";
+                            }else{
+                                return "complete";
+                            }
+
+                        }else{
+                            return "complete";
+                        }
+                    }
+                    break;
+
                 case "terms":
                     if($current < $self) return "";
@@ -8670 +8717 @@
                 $steps = $formData['nav_steps_list'][0];
                 $nav_label_replace_a = $formData['nav_steps_list'][1];
+                $extra_amenity_id = $formData['nav_steps_list'][2];
 
                 // insert last step if not in navigation
@@ -8677 +8725 @@
 
             }else{
-                $steps = ['login', 'profile', 'uploads', 'amenities', 'terms', 'payment'];
+                $steps = ['login', 'profile', 'uploads', 'amenities', 'badges', 'terms', 'payment'];
             }
 
@@ -8732 +8780 @@
                 $link_class = ($li_class == 'active' || $is_last_step) ? 'btn-nav btn-nav-active' : 'btn-nav btn-nav-inactive';
 
+                // append badge navigation
+                if($steps[$key] == 'badges' && $extra_amenity_id > 0){
+                    $val .= "&extra=$extra_amenity_id";
+                }
+
+                $skip_menu = false;
+
                 if((int)$formData["applicant_a"]["origin_applic_id"] > 0) {
                     ?>
@@ -8741 +8796 @@
                         </div>
                     </div>
-
                     <?php
-                }else{
+                }elseif(!$skip_menu){
                     ?>
                     <li id="<?php echo esc_attr($key); ?>" data-step="<?php echo($key + 1); ?>" class="<?= $li_class; ?>">
@@ -9217 +9271 @@
                     }
                     ?>
-                    v3.5.1
+                    v3.5.2
                     : <a href="https://app.registerone.com/privacy-policy" target="_blank">Privacy Policy</a>
                     <?php

registerone-event-forms/trunk/readme.txt

@@ -6 +6 @@
 Author: RegisterONE
 Requires at least: 5
-Tested up to: 5.9
-Version 3.5.1
-Stable tag: 3.5.1
+Tested up to: 6.0
+Version 3.5.2
+Stable tag: 3.5.2
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -133 +133 @@
 == Changelog ==
 
+= 3.5.2 =
+* UPDATE: Tested compatability with WP v6
+* NEW: Added dedicated navigation element for badging form
+
 = 3.5.1 =
 * UPDATE: Split payment Cancel button added

registerone-event-forms/trunk/registerone-wordpress-client.php

@@ -4 +4 @@
 Plugin URI: https://www.registerone.com
 Description: Event registration and digital profile builder, conference video streaming, booth mapping, meetings & ticketing
-Version: 3.5.1
+Version: 3.5.2
 Author: RegisterONE
 Author URI: http://www.registerone.com