Changeset 2965990

Timestamp:

09/12/2023 03:46:16 PM (2 years ago)

Author:

registerone

Message:

v3.6.13

Location:

registerone-event-forms/trunk

Files:

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

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

@@ -523 +523 @@
         }
 
-        if(1 == 2 || $_SERVER['REMOTE_ADDR'] == '72.107.108.236x') {
+        if(1 == 2 && $_SERVER['REMOTE_ADDR'] == '') {
             echo "<pre>";
             // print_r($this->event_attributes);
@@ -533 +533 @@
         $responses = wp_remote_retrieve_body( wp_remote_request( $request_url, $request_args ) );
 
-        if(1 == 2 && $_SERVER['REMOTE_ADDR'] == '72.104.155.107') {
+        if(1 == 2 && $_SERVER['REMOTE_ADDR'] == '') {
             // die($this->current_screen);
 
@@ -1775 +1775 @@
 
                 if(isset($data['amenity_extra'])){
-                    // print_r($responses); die;
                 }
 
                 $redirect_url = $root;
 
-                if($responses['code'] == 202 ||
+                if($responses['code'] == 203) {
+                    // redirect to badge page if duplicate found
+
+                    if(isset($responses['add_extra_fields'])){
+                        $extra_amenity_id = $responses['next_step'][2];
+                        $redirect_url .= "?badges&extra={$extra_amenity_id}";
+                        // dupflag
+                    }
+
+                    $dup_id_a = [];
+                    if(isset($responses['duplicates'])){
+                        if(is_array($responses['duplicates'])){
+                            foreach($responses['duplicates'] AS $dup_id => $email){
+                                $dup_id_a[] .= $dup_id;
+                            }
+                        }
+                        $dup_id_uri = implode("_", $dup_id_a);
+                        $redirect_url .= "&dupflag=".$dup_id_uri;
+                    }
+
+                }elseif($responses['code'] == 202 ||
                     $responses['code'] == 201 ||
                     $responses['code'] == 200) {
@@ -2368 +2387 @@
 
         if(isset($data['amenity_extra'])) {
-            // print_r($responses); die;
+            //print_r($responses); die;
         }
 
@@ -4875 +4894 @@
                                 swal({
                                     title: "Error: " + status['code'],
-                                    text: "Detail: Could not be added.",
+                                    text: "Detail: " + status['detail'],
                                     type: "error",
                                     showCancelButton: true,
@@ -6251 +6270 @@
         }
 
+        if(isset($_GET['dupflag']) && $_GET['dupflag'] != ''){
+            // inject inline styles for badge blocks
+            $dup_css_tenpl = '<style>#block-aid-set { border: 2px solid #ffb8b8; background-color: #ffe9e9;}</style>';
+            $dup_uri = $_GET['dupflag'];
+            $dups_a = explode("_", $dup_uri);
+            foreach($dups_a AS $dup_a){
+                $dup_block_id_css = $dup_css_tenpl;
+                $dup_block_id_css = str_replace('aid-set', $dup_a, $dup_block_id_css);
+                echo $dup_block_id_css;
+            }
+        }
+
         /*
          *  <input data-inputmask="'mask': '<?= $input_data['input_mask']; ?>'" type="tel" id="clients-<?= $input_data['model_field']; ?>" class="telephone form-control" name="<?= $input_data['model_label']; ?>[<?= $input_data['model_field']; ?>]" maxlength="255" value="<?= $input_data['value']; ?>" style="max-width: <?= $max_width; ?>" <?= $required; ?>>
@@ -6295 +6326 @@
             while($extra_qty > $c) {
                 $c++;
+                if(in_array("{$amenity_id}-{$c}", $dups_a)){
+                    echo "<h4>Duplicate e-mail found for this badge! Use a different e-mail address.</h4>";
+                }
                 ?>
 
-                <div class="badge_block">
+                <div id="block-<?= $amenity_id ?>-<?= $c ?>" class="badge_block">
 
                 <div class="amenity-title" style="float: left;">
@@ -6305 +6339 @@
                 <?php if($formData['amenity_badge_am_type_a'][$amenity_id] == 2): ?>
                     <?php if(isset($formData['amenity_badge_short_url_a'][$amenity_id][$c])): ?>
-                        <div style="float:right"><strong>Profile Form:</strong> <a target="_blank" href="<?php echo esc_url($formData['amenity_badge_short_url_a'][$amenity_id][$c]) ?>"><?= $formData['amenity_badge_short_url_a'][$amenity_id][$c] ?></a></div>
+                        <div style="float:right"><strong>Badge Details Form:</strong> <a target="_blank" href="<?php echo esc_url($formData['amenity_badge_short_url_a'][$amenity_id][$c]) ?>"><?= $formData['amenity_badge_short_url_a'][$amenity_id][$c] ?></a></div>
                     <?php else: ?>
-                        <div style="float:right"><strong>Profile Form:</strong> <span class="red-alert"><strong>New or Incomplete</strong></span></div>
+                        <div style="float:right"><strong>Badge Details Form:</strong> <span class="red-alert"><strong>New or Incomplete</strong></span></div>
                     <?php endif; ?>
                 <?php endif; ?>
@@ -6490 +6524 @@
             </div>
         </div>
+
+        <script type="text/javascript">
+            /* remember field data and return on duplicate email catch */
+            var $ = jQuery.noConflict();
+
+            $(document).on("change", ".form-control", e => {
+              if (!e.target.id) return;
+              localStorage.setItem(e.target.id, $(e.target).val());
+            });
+
+            <?php if(isset($dup_block_id_css)): ?>
+            $(() => $(".form-control").each(function() {
+              if (!this.id) return;
+              let val = localStorage.getItem(this.id);
+              if (val) $(this).val(val);
+            }));
+            <?php endif; ?>
+        </script>
         <?php
 
@@ -10093 +10145 @@
                             }
                             ?>
-                            v3.6.12
+                            v3.6.13
                             : <a href="https://app.registerone.com/privacy-policy" target="_blank">Privacy Policy</a>
                             <?php

registerone-event-forms/trunk/readme.txt

@@ -7 +7 @@
 Requires at least: 5
 Tested up to: 6.2
-Version 3.6.12
-Stable tag: 3.6.12
+Version 3.6.13
+Stable tag: 3.6.13
 Requires PHP: 7.4
 License: GPLv2 or later
@@ -138 +138 @@
 == Changelog ==
 
+= 3.6.13 =
+* NEW: Badge design can be customized based on ticket type purchased. Multiple ticket types can be sold from one form.
+* NEW: Badge profiles now warn user if a duplicate email is detected for the same event.
+
 = 3.6.12 =
 * NEW: setting to limit or disable keyword selections
@@ -447 +451 @@
 == Upgrade Notice ==
 
-= 3.6.12 =
-* NEW: setting to limit or disable keyword selections
+= 3.6.13 =
+* NEW: Badge design can be customized based on ticket type purchased. Multiple ticket types can be sold from one form.
+* NEW: Badge profiles now warn user if a duplicate email is detected for the same event.

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

@@ -4 +4 @@
 Plugin URI: https://www.registerone.com
 Description: RegisterONE – Exhibitor & Speaker Registration, Advanced Booth Mapping, Ticketing
-Version: 3.6.12
+Version: 3.6.13
 Author: RegisterONE
 Author URI: http://www.registerone.com