Context Navigation

← Previous Changeset
Next Changeset →

Changeset 2370819

Timestamp:

08/28/2020 04:10:57 AM (6 years ago)

Author:

subscribility

Message:

Release version 2.9.19.5

Location:

subscribility

Files:

: 4 deleted
: 20 edited
: 8 copied

tags/2.9.19.5 (copied) (copied from subscribility/trunk)
tags/2.9.19.5/includes (copied) (copied from subscribility/trunk/includes)
tags/2.9.19.5/includes/Bootstrap (deleted)
tags/2.9.19.5/includes/admin/assets/css/wp99234-admin.css (modified) (1 diff)
tags/2.9.19.5/includes/bootstrap (copied) (copied from subscribility/trunk/includes/bootstrap)
tags/2.9.19.5/includes/common/InfoDump.php (deleted)
tags/2.9.19.5/includes/frontend/assets/css/wp99234_frontend.css (modified) (5 diffs)
tags/2.9.19.5/includes/frontend/assets/js/wp99234_frontend.js (modified) (1 diff)
tags/2.9.19.5/includes/frontend/controllers/CustomerController.php (deleted)
tags/2.9.19.5/includes/frontend/controllers/OrderController.php (deleted)
tags/2.9.19.5/includes/frontend/controllers/class-wp99234-forms.php (modified) (2 diffs)
tags/2.9.19.5/includes/frontend/controllers/class-wp99234-order-controller.php (modified) (2 diffs)
tags/2.9.19.5/includes/frontend/controllers/class-wp99234-template.php (copied) (copied from subscribility/trunk/includes/frontend/controllers/class-wp99234-template.php)
tags/2.9.19.5/includes/frontend/controllers/class-wp99234-wc-filter.php (modified) (9 diffs)
tags/2.9.19.5/includes/frontend/controllers/class-wp99234-wc-payment-gateway.php (modified) (2 diffs)
tags/2.9.19.5/includes/frontend/views/newsletter_form.php (modified) (1 diff)
tags/2.9.19.5/includes/frontend/views/registration_form.php (modified) (4 diffs)
tags/2.9.19.5/readme.txt (copied) (copied from subscribility/trunk/readme.txt) (2 diffs)
tags/2.9.19.5/vendor/cloudinary/cloudinary_php/src/Cloudinary.php (copied) (copied from subscribility/trunk/vendor/cloudinary/cloudinary_php/src/Cloudinary.php)
tags/2.9.19.5/vendor/inacho/php-credit-card-validator/src/CreditCard.php (copied) (copied from subscribility/trunk/vendor/inacho/php-credit-card-validator/src/CreditCard.php)
tags/2.9.19.5/wp99234.php (copied) (copied from subscribility/trunk/wp99234.php) (2 diffs)
trunk/includes/admin/assets/css/wp99234-admin.css (modified) (1 diff)
trunk/includes/frontend/assets/css/wp99234_frontend.css (modified) (5 diffs)
trunk/includes/frontend/assets/js/wp99234_frontend.js (modified) (1 diff)
trunk/includes/frontend/controllers/class-wp99234-forms.php (modified) (2 diffs)
trunk/includes/frontend/controllers/class-wp99234-order-controller.php (modified) (2 diffs)
trunk/includes/frontend/controllers/class-wp99234-wc-filter.php (modified) (9 diffs)
trunk/includes/frontend/controllers/class-wp99234-wc-payment-gateway.php (modified) (2 diffs)
trunk/includes/frontend/views/newsletter_form.php (modified) (1 diff)
trunk/includes/frontend/views/registration_form.php (modified) (4 diffs)
trunk/readme.txt (modified) (2 diffs)
trunk/wp99234.php (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

subscribility/tags/2.9.19.5/includes/admin/assets/css/wp99234-admin.css

r2333850	r2370819
479	479	}
480	480	.troly_log_table td span {
481		width: 80px;
	481	width: 90px;
482	482	height: 25px;
483	483	display: inline-block;

subscribility/tags/2.9.19.5/includes/frontend/assets/css/wp99234_frontend.css

-                      r2319969
+                      r2370819
+}
 .woocommerce .woocommerce-form .password-input .show-password-input {
-    position: absolute;
-    right: .7em;
-    top: 0;
     cursor: pointer;
     text-decoration: none;
 …
+}
+#wp99234_membership_options {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+}
+#wp99234_membership_options .wp99234-membership_option {
+    list-style: none;
+    border:1px solid transparent;
+    padding:20px;
+    width: 100%;
+    margin: 0;
+}
+#wp99234_membership_options .wp99234-membership_option.selected {
+    border-color: #CCC;
+}
+#wp99234_membership_options .wp99234-membership_option.inactive {
+    opacity: 0.6;
+}
 /* @todo: Dumped styling from Patina. Needs to be amended. */
-#wp99234_member_registration_form .wp99234-membership_option {
-    width: 44% !important;
+}
-#wp99234_member_registration_form .wp99234-membership_option:nth-child(2n) {
-    margin-left: 2% !important;
+}
-#wp99234_member_registration_form .wp99234-membership_option_title {
-    color: inherit;
+}
-#wp99234_member_registration_form .wp99234-input_field_text,
-#wp99234_member_registration_form #subs_birthday,
-#wp99234_member_registration_form .cc_details input,
-#wp99234_member_registration_form .wp99234-input_field_password {
-    border: none !important;
-    padding: 15px 13px;
+}
-#wp99234_member_registration_form .wp99234-section_title {
-    color: inherit !important;
-    text-align: left !important;
+}
-#wp99234_member_registration_form p.form-row {
-    text-align: left !important;
-    padding-top: 5px;
-    padding-bottom: 5px;
+}
 #wp99234_member_registration_form .wp99234-section.chosen-preferences {
     padding-bottom: 15px;
 …
+}
-#wp99234_member_registration_form #wp99234_member_submit,
-.wp99234-selected_membership {
-    color: #ffffff;
-    font-family: 'Raleway', sans-serif;
-    font-size: 11px;
-    height: 45px;
-    font-style: normal;
-    font-weight: 700;
-    background-color: #a05f42;
-    -webkit-border-radius: 1px;
-    letter-spacing: 1px;
-    text-transform: uppercase;
-    border-width: 0px;
+}
-#wp99234-registration_shipping_instructions {
-    border: none !important;
+}
 #wp99234_member_registration_form .form-submit.form-row {
     text-align: center !important;
+}
+.form-row.shipping_instructions {
+    width: 105% !important;
+#wp99234_member_registration_form .select2-container--default .select2-selection--single {
+    height: 48px !important;
+}
+#wp99234_member_registration_form .select2-container--default .select2-selection--single .select2-selection__rendered {
+    line-height: 48px;
+}
+#wp99234_member_registration_form .select2-container--default .select2-selection--single .select2-selection__arrow {
+    height: 46px;
+}
 …
+}
-#wp99234-registration_shipping_instructions {
-    height: 115px;
+}
 #order_review table.shop_table.woocommerce-checkout-review-order-table-bak {
   width: 50% !important;
 …
+}
+#wc-wp99234_payment_gateway-cc-form input.input-text {
+ width: 98%;
+}
+#wp99234_member_registration_form .wp99234-membership_option:nth-child(2n) {
+  margin-bottom: 30px;
+}
+@media (min-width: 320px) {
+    #wp99234_member_registration_form .wp99234-membership_option {
+        width: 90% !important;
+        margin-left: 0;
+    }
+    #wp99234_member_registration_form .wp99234-membership_option:nth-child(2n) {
+      margin-left: 0 !important;
+    }
+}
+@media (min-width: 992px) {
+    #wp99234_member_registration_form .wp99234-membership_option {
+        width: 44% !important;
+    }
+    #wp99234_member_registration_form .wp99234-membership_option:nth-child(2n) {
+      margin-left: 15px !important;
+    }
+}
+.wp99234-input_field_text.input-text {
+    width: 100%;
+    font-size: 1.6rem;
+    padding: 1.5rem 1.8rem;
+}

subscribility/tags/2.9.19.5/includes/frontend/assets/js/wp99234_frontend.js

-                      r2319969
+                      r2370819
             $("#hidden_cc_form :input").attr('required', '1');
+        }
+    });
+    });
+    /**
+     * Hide shipping calculator, shipping form if local pickup is pre-selected.
+     */
+    if ( $( 'input[type=radio].shipping_method:checked' ).length > 0 && $( 'input[type=radio].shipping_method:checked' ).val().indexOf( 'local_pickup' ) >= 0 ) {
+        $( '.woocommerce-shipping-destination, .woocommerce-shipping-calculator, .woocommerce-shipping-fields, #order_comments_field' ).hide()
+    }
+    /**
+     * Hide shipping calculator, shipping form if local pickup is selected.
+     */
+    $( 'body' ).on( 'click', 'input[type=radio].shipping_method', function() {
+        const method = $(this).val()
+        // Only trigger it once all the AJAX has stopped.
+        $( document ).ajaxStop( function() {
+            if ( method.indexOf( 'local_pickup' ) >= 0 ) {
+                $( '.woocommerce-shipping-destination, .woocommerce-shipping-calculator, .woocommerce-shipping-fields, #order_comments_field' ).hide()
+            } else {
+                $( '.woocommerce-shipping-destination, .woocommerce-shipping-calculator, .woocommerce-shipping-fields, #order_comments_field' ).show()
+            }
+        });
+    })
 });

subscribility/tags/2.9.19.5/includes/frontend/controllers/class-wp99234-forms.php

-                      r2333850
+                      r2370819
     function display_field($key, $field, $css_class = null) {
         $type = (isset($field['type']))?$field['type']:'text';
+        $isRequired = isset( $field['attributes']['required'] ) ?? false;
         ?>
         <p class="form-row <?php echo $key . ' ' . $css_class;?>">
-        <?php /*if ( isset( $this->errors[ $key ] ) ): ?>
-        <p class="error">
-        <?php echo esc_html( $this->errors[ $key ] ); ?>
-        </p>
-        <?php endif;*/?>
         <?php
 …
             <label for="<?php echo $key;?>">
                 <?php echo $field['label'];?>
+                <?php echo $isRequired ? '<abbr class="required" title="required">*</abbr>' : ''; ?>
             </label>
         <?php

subscribility/tags/2.9.19.5/includes/frontend/controllers/class-wp99234-order-controller.php

-                      r2333875
+                      r2370819
         $this->_orderData[ 'order' ] = [
             'source' => 'web',
             'status' => 'draft', // Why are these draft orders?
+            'status' => 'confirmed',
             'fname' => $this->_order->get_billing_first_name(),
             'lname' => $this->_order->get_billing_last_name(),
 …
             'shipment' => [
                 'name' => $this->_order->get_shipping_first_name() . ' ' . $this->_order->get_shipping_last_name(),
+                'delivery_address'  => $this->_order->get_shipping_address_1(),
+                'delivery_suburb'   => $this->_order->get_shipping_city(),
+                'delivery_postcode' => $this->_order->get_shipping_postcode(),
+                'delivery_state'    => $this->_order->get_shipping_state(),
+                'delivery_country'  => WC()->countries->countries[ $this->_order->get_shipping_country() ],
+                'same_billing'      => false,
+            ]
-        ] );
-        WP99234()->_customer->updateCustomerData( [
-            'delivery_address'  => $this->_order->get_shipping_address_1(),
-            'delivery_suburb'   => $this->_order->get_shipping_city(),
-            'delivery_postcode' => $this->_order->get_shipping_postcode(),
-            'delivery_state'    => $this->_order->get_shipping_state(),
-            'delivery_country'  => WC()->countries->countries[ $this->_order->get_shipping_country() ],
-            'same_billing'      => false,
         ] );

subscribility/tags/2.9.19.5/includes/frontend/controllers/class-wp99234-wc-filter.php

-                      r2333850
+                      r2370819
         add_action( 'woocommerce_check_cart_items', [$this, 'wp99234_enforce_minimum_quantity'], 10 );
         add_action( 'woocommerce_cart_calculate_fees', [$this, 'wp99234_add_cart_fees'], 10, 1 );
         add_action( 'troly_order_status_check', [$this, 'check_wp99234_payment_status' ], 10, 1 );
         add_action( 'woocommerce_order_status_cancelled' , [$this, 'removeOrderStatusCheckCRON'], 10 );
+        //add_action( 'troly_order_status_check', [$this, 'check_wp99234_payment_status' ], 10, 1 );
+        //add_action( 'woocommerce_order_status_cancelled' , [$this, 'removeOrderStatusCheckCRON'], 10 );
         add_filter( 'woocommerce_is_purchasable', [$this, 'restrictMembersOnlyProducts'], 20, 2 );
         add_filter( 'woocommerce_post_class', [$this, 'addMembersOnlyClass'], 20, 2 );
         add_filter( 'woocommerce_login_redirect', [$this, 'trolySourceRedirect'], 10, 2 );
+        add_action( 'woocommerce_order_status_processing', [$this, 'exportPaymentToSubs' ], 10, 1 );
+    }
+    /**
+     * Send payment information to Troly once an order is paid or refunded
+     * in WordPress that does not use the Troly gateway.
+     *
+     * @param int $orderID
+     * @return void
+     */
+    public function exportPaymentToSubs( $orderID ) {
+        WP99234()->_woocommerce->export_payment( $orderID );
+    }
 …
     public function addMembersOnlyClass( $classes, $product )
+    {
         if ( has_term( 'visible-to-members-only', 'product_tag', $product->get_id() ) ) {
+        if ( has_term( 'purchase-by-members-only', 'product_tag', $product->get_id() ) ) {
             $classes[] = 'membersonly';
+        }
 …
     public function restrictMembersOnlyProducts( $isPurchaseable, $product )
+    {
         if ( has_term( 'visible-to-members-only', 'product_tag', $product->get_id() ) ) {
+        if ( has_term( 'purchase-by-members-only', 'product_tag', $product->get_id() ) ) {
             if ( is_user_logged_in() ) {
 …
          * @todo Using this here but not certain. Triggering the callback cron for Troly.
          */
         if ( ! wp_next_scheduled( 'troly_order_status_check' ) ) {
             wp_schedule_event( time(), '15_seconds', 'troly_order_status_check', [ $order_id ] );
+        }
+        //if ( ! wp_next_scheduled( 'troly_order_status_check' ) ) {
+        //  wp_schedule_event( time(), '15_seconds', 'troly_order_status_check', [ $order_id ] );
+        //}
         if ( isset( $response->id ) ) {
 …
      * @throws Exception
      */
+    public function export_payment( $order_id ) {
+      $order = wc_get_order($order_id);
+      $subs_id = get_post_meta( $order_id, 'subs_id', true );
+      $trx_id = $order->get_transaction_id();
+      WP99234()->logger->notice("Processing $subs_id");
+      $mtype = $order->get_payment_method();
+      WP99234()->logger->notice("Attempting to export a payment for $order_id (Troly ID $subs_id) with $mtype (TRXID $trx_id) as payment");
+      switch($mtype){
+        case 'cod':
+          $mtype = 'cash';
+          break;
+        case 'bacs':
+          $mtype = 'transfer';
+          break;
+        default:
+          $mtype = $mtype;
+          break;
+      }
+      # We set rrn to allow Stream objects to show reference
+      # This will also be set on the Payment object as well
+      $pay_data = array(
+        'order' => array (
+          'id'  => $subs_id,
+        //   'payment_type' => 'offline',
+          'payment_meth' => 'website',
+          'payment_src'  => $mtype,
+          'status' => 'confirmed' ,
+          'rrn' => $trx_id
+        ),
+        'id'  => $subs_id
+      );
+      $response = WP99234()->_api->_call( $this->payment_api_endpoint.$subs_id, $pay_data, 'PUT' );
+      if( isset( $response->channel ) ){
+            $order->add_order_note( 'Exported payment information to Troly' );
+            WP99234()->logger->notice("Succeeded exporting payment for $order_id (Troly ID $subs_id) with $mtype as payment");
+            return true;
+        } else {
+            $order->add_order_note( 'Could not export payment information to Troly' );
+            WP99234()->logger->notice("Failed exporting payment for $order_id (Troly ID $subs_id) with $mtype as payment");
+            throw new \Exception( __( 'An error has occurred. Please get in touch with us as soon as possible.', 'wp99234' ) );
+    public function export_payment( $order_id )
+    {
+        $order = wc_get_order($order_id);
+        $subs_id = get_post_meta( $order_id, 'subs_id', true );
+        $trx_id = $order->get_transaction_id();
+        $mtype = $order->get_payment_method();
+        // Do not trigger this for Troly payment gateway.
+        if ( 'wp99234_payment_gateway' !== $mtype ) {
+            WP99234()->logger->notice("Processing $subs_id");
+            WP99234()->logger->notice("Attempting to export a payment for $order_id (Troly ID $subs_id) with $mtype (TRXID $trx_id) as payment");
+            switch($mtype){
+                case 'bacs':
+                    $mtype = 'transfer';
+                    break;
+                default:
+                    $mtype = $mtype;
+                break;
+            }
+            # We set rrn to allow Stream objects to show reference
+            # This will also be set on the Payment object as well
+            $pay_data = [
+                'order' => [
+                    'id'  => $subs_id,
+                    'payment_type' => 'offline',
+                    'payment_meth' => 'website',
+                    'payment_src'  => $mtype,
+                    'status' => 'confirmed' ,
+                    'rrn' => $trx_id
+                ],
+                'id'  => $subs_id
+            ];
+            $response = WP99234()->_api->_call( $this->payment_api_endpoint.$subs_id, $pay_data, 'PUT' );
+            if ( isset( $response->channel ) ) {
+                $order->add_order_note( 'Exported payment information to Troly' );
+                WP99234()->logger->notice("Succeeded exporting payment for $order_id (Troly ID $subs_id) with $mtype as payment");
+                return true;
+            } else {
+                $order->add_order_note( 'Could not export payment information to Troly' );
+                WP99234()->logger->notice("Failed exporting payment for $order_id (Troly ID $subs_id) with $mtype as payment");
+                throw new \Exception( __( 'An error has occurred. Please get in touch with us as soon as possible.', 'wp99234' ) );
+            }
+        }
+    }
 …
         $order = new WC_Order( $order_id );
+        $rrn = $order->get_transaction_id();
         $order_status = $order->get_status() !== 'failed' ? 'in-progress' : false;
 …
         $data = array(
             'status' => 'confirmed', // $order_status
             'id'     => $subs_id,
+            'id'     => $subs_id, // maybe remove this
             'order'  => array(
                 'status'       => 'confirmed',
+                'payment_type' => $payment_type
+                'payment_type' => $payment_type,
+                'payment_meth' => 'website',
+                'payment_src'  => 'wp99234_payment_gateway',
+                'rrn' => $rrn,
+            )
         );
 …
+     *
      * @param int|string $orderID
      * @todo fix this
+     * @todo removing this since the status of orders placed via Troly gateway are begin updated already
      * @return void
      */
     public function check_wp99234_payment_status( $orderID ) {
         if ( ! $orderID ) return;
         $order = wc_get_order( $orderID );
         if ( ! $order ) return;
         $trolyOrderID = get_post_meta( $order->get_id(), 'subs_id', true );
         if ( ! $trolyOrderID || empty( $trolyOrderID) ) return;
         $endpoint = sprintf( "%sorders/%s.json", WP99234_Api::$endpoint, $trolyOrderID );
         $response = WP99234()->_api->_call( $endpoint );
         // Just taking in the case of "success" for now.
         if ( $response && is_object( $response ) && ( $response->payment_status === 'auth'
         || $response->payment_status === 'paid' ) ) {
             $order->update_status( 'processing' );
             // Removing the specific CRON after order status has been updated.
             wp_clear_scheduled_hook( 'troly_order_status_check', [ $orderID ] );
+        }
         exit;
+    }
+    //public function check_wp99234_payment_status( $orderID ) {
+    //  if ( ! $orderID ) return;
+    //  $order = wc_get_order( $orderID );
+    //  if ( ! $order ) return;
+    //  $trolyOrderID = get_post_meta( $order->get_id(), 'subs_id', true );
+    //  if ( ! $trolyOrderID || empty( $trolyOrderID) ) return;
+    //  $endpoint = sprintf( "%sorders/%s.json", WP99234_Api::$endpoint, $trolyOrderID );
+    //  $response = WP99234()->_api->_call( $endpoint );
+    //  // Just taking in the case of "success" for now.
+    //  if ( $response && is_object( $response ) && ( $response->payment_status === 'auth'
+    //  || $response->payment_status === 'paid' ) ) {
+    //      $order->update_status( 'processing' );
+    //      // Removing the specific CRON after order status has been updated.
+    //      wp_clear_scheduled_hook( 'troly_order_status_check', [ $orderID ] );
+    //  }
+    //  exit;
+    //}
     /**
 …
      * @return void
      */
     public function removeOrderStatusCheckCRON( $orderID )
+    {
         wp_clear_scheduled_hook( 'troly_order_status_check', [ $orderID ] );
+    }
+    //public function removeOrderStatusCheckCRON( $orderID )
+    //{
+    //  wp_clear_scheduled_hook( 'troly_order_status_check', [ $orderID ] );
+    //}
     /**

subscribility/tags/2.9.19.5/includes/frontend/controllers/class-wp99234-wc-payment-gateway.php

-                      r2319969
+                      r2370819
         add_action( 'woocommerce_after_checkout_form', array($this, 'add_cc_field_toggle_js'), 6);
-        add_action( 'woocommerce_payment_complete', [ $this, 'exportPaymentToSubs' ], 10, 2);
+    }
-    /**
-     * Send payment information to Troly once an order is paid or refunded
-     * in WordPress that does not use the Troly gateway
+     *
-     * @param int $order_id
-     * @param array $posted_data
-     * @return void
-     */
-    public function exportPaymentToSubs( $order_id, $posted_data ) {
-        WP99234()->_woocommerce->export_payment( $order_id );
+    }
 …
             $return_url = $this->get_return_url( $order );
+            if( $websocket_channel ){
+                $return_url = esc_url_raw( add_query_arg( 'ws_channel', $websocket_channel, $return_url ) );
+            }
+            if ( $websocket_channel ) {
+                $order->update_status( 'processing' );
+                $return_url = esc_url_raw( add_query_arg( 'ws_channel', $websocket_channel, $return_url ) );
+            }
             // Return thankyou redirect

subscribility/tags/2.9.19.5/includes/frontend/views/newsletter_form.php

-                      r2319969
+                      r2370819
 </style>
+<form id="newsletter_registration_form" action="#newsletter_registration_form" method="POST">
+<div class="woocommerce">
+    <form id="newsletter_registration_form" action="#newsletter_registration_form" method="POST">
     <div class="woocommerce">
         <?php if ( !is_admin() ) { if ( function_exists('wc_print_notices') ) { wc_print_notices(); } } ?>
     </div>
+        <div class="woocommerce">
+            <?php if ( !is_admin() ) { if ( function_exists('wc_print_notices') ) { wc_print_notices(); } } ?>
+        </div>
     <div class="cfix">
+        <div class="cfix">
+        <?php $fields = array(
+            'first_name' => array(
+                (get_option('wp99234_newsletter_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'First Name', 'wp99234' ),
+                'default' => '',
+            ),
+            'reg_email' => array(
+                (get_option('wp99234_newsletter_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Email', 'wp99234' ),
+                'default' => '',
+            ),
+        );
+            <?php $fields = array(
+                'first_name' => array(
+                    (get_option('wp99234_newsletter_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'First Name', 'wp99234' ),
+                    'default' => '',
+                    'attributes' => [
+                        'class' => 'input-text',
+                    ],
+                ),
+                'reg_email' => array(
+                    (get_option('wp99234_newsletter_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Email', 'wp99234' ),
+                    'default' => '',
+                    'attributes' => [
+                        'class' => 'input-text',
+                    ],
+                ),
+            );
+        if ( get_option('wp99234_newsletter_collect_mobile') == 'yes' ) {
+          $fields['mobile'] = array(
+              ( get_option( 'wp99234_newsletter_use_placeholders' ) == 'yes' ? 'placeholder' : 'label' ) => __( 'Mobile', 'wp99234' ),
+              'default' => '',
+          );
+        }
+            if ( get_option('wp99234_newsletter_collect_mobile') == 'yes' ) {
+            $fields['mobile'] = array(
+                ( get_option( 'wp99234_newsletter_use_placeholders' ) == 'yes' ? 'placeholder' : 'label' ) => __( 'Mobile', 'wp99234' ),
+                'default' => '',
+                'attributes' => [
+                    'class' => 'input-text',
+                ],
+            );
+            }
         // Only show Postcode if not 'hidden'
         if ( get_option('wp99234_newsletter_collect_postcode') != 'hidden' ) {
           $fields['postcode'] = array(
               ( get_option( 'wp99234_newsletter_use_placeholders' ) == 'yes' ? 'placeholder' : 'label' ) => __( 'Postcode', 'wp99234' ),
               'default' => '',
           );
+        }
+            // Only show Postcode if not 'hidden'
+            if ( get_option('wp99234_newsletter_collect_postcode') != 'hidden' ) {
+            $fields['postcode'] = array(
+                ( get_option( 'wp99234_newsletter_use_placeholders' ) == 'yes' ? 'placeholder' : 'label' ) => __( 'Postcode', 'wp99234' ),
+                'default' => '',
+            );
+            }
         ?>
+            ?>
         <?php foreach( $fields as $key => $field ){
             WP99234()->_newsletter->display_field( $key, $field );
         } ?>
+            <?php foreach( $fields as $key => $field ){
+                WP99234()->_newsletter->display_field( $key, $field );
+            } ?>
         <p class="form-submit form-row">
             <input type="hidden" name="<?php echo WP99234()->_newsletter->nonce_name; ?>" value="<?php echo wp_create_nonce( WP99234()->_newsletter->nonce_action ); ?>" />
             <input type="submit" name="<?php echo WP99234()->_newsletter->submit_name; ?>" value="<?php _e( 'Sign Up Now', 'wp99234' ); ?>" class="wp99234-newsletter-signup-button" />
         </p>
+            <p class="form-submit form-row">
+                <input type="hidden" name="<?php echo WP99234()->_newsletter->nonce_name; ?>" value="<?php echo wp_create_nonce( WP99234()->_newsletter->nonce_action ); ?>" />
+                <input type="submit" name="<?php echo WP99234()->_newsletter->submit_name; ?>" value="<?php _e( 'Sign Up Now', 'wp99234' ); ?>" class="wp99234-newsletter-signup-button" />
+            </p>
     </div>
+        </div>
+</form>
+    </form>
+</div>

subscribility/tags/2.9.19.5/includes/frontend/views/registration_form.php

-                      r2333850
+                      r2370819
   $current_membership_id = 'null';
+// Enqueue credit card validator logics.
 wp_enqueue_script( 'jquery-payment-troly' );
 echo "\n\n".'<script type="text/javascript">window.troly_current_membership_id = '.$current_membership_id.';</script>'."\n\n";
+// Enqueue WooCommerce styling and functions for dropdown elements.
+wp_enqueue_style( 'select2' );
+wp_enqueue_script( 'selectWoo' );
 get_header();
 ?>
 <style type="text/css">
+    .membership_variation.hide { display:none; }
+    /* clearfix hack class */
+    .wp99234-cfix:after { content: ""; display: table; clear: both; }
+    li.wp99234-membership_option {
+        list-style:none;
+        border:1px solid transparent;
+        float:left;
+        padding:20px;
+        margin-bottom:4%;
+        width: 100%;
+        position: relative;
+    }
+    .wp99234-membership_option p {
+        padding: 10px 5px;
+    }
+    /* Emphasize input fields to inverse background */
+    .wp99234-input_field_text, #subs_birthday,
+    .wp99234-input_field_password,
+    .wp99234-input_field_textfield,
+    .wp99234-section.cc_details input[type="text"],
+    .wp99234-section.cc_details input[type="tel"] {
+        border-bottom: 1px solid gray;
+    }
+    .wp99234-section.chosen-preferences .tags {
+        margin-top: 5px;
+    }
+    .wp99234-section.chosen-preferences .tag, .wp99234-section.chosen-preferences .tag-editable {
+        position: relative;
+        display: inline-block;
+    }
+    .wp99234-section.chosen-preferences .tag-selected button:before,
+    .wp99234-membership_option.selected button:before {
+        content:'\2713\00a0\00a0'; /* Add check icon to selected tag */
+        white-space: pre;
+    }
+    .wp99234-membership_option:nth-child(2n+1){ clear:both; }
+    .wp99234-membership_option.selected{
+        border: 1px solid #CCC;
+    }
+    .wp99234-selected_membership,
+    .wp99234-restricted_membership {
+        /*margin-top: 1.313em;*/
+    }
+    .wp99234-section.cc_details {
+        padding-top: 15px;
+    }
+    #wp99234-create_password_section {
+        padding-top: 15px;
+    }
+    #wp99234_member_submit {
+        padding: 5px;
+        height: auto;
+    }
+    @media screen and (min-width: 700px) {
+        .wp99234-membership_option:nth-child(2n){
+            margin-left:4%;
+        }
+        .wp99234-membership_option{
+            width:46%;
+            float:left;
+        }
+    }
+    .wp99234_delivery_area {
+      display: block;
+      width: 100%;
+      min-height: 150px;
+    }
+    /* User details, CC details and delivery sections */
+    .wp99234-section.user_details,
+    .wp99234-section.cc_details,
+    .wp99234-section.delivery_details,
+    .wp99234-input_field_textfield {
+        width: 100%;
+        box-sizing: border-box;
+    }
+    @media screen and (min-width: 700px) {
+        .wp99234-section.user_details,
+        .wp99234-section.cc_details {
+            float: left;
+            width: 50%;
+            padding-right: 20px;
+        }
+        .wp99234-section.delivery_details {
+            float: right;
+            width: 50%;
+            padding-left: 20px;
+        }
+    }
+    .wp99234-section.user_details label,
+    .wp99234-section.cc_details label,
+    .wp99234-section.delivery_details label,
+    .wp99234-section.user_details input,
+    .wp99234-section.cc_details input,
+    .wp99234-section.delivery_details input {
+        width: 100%;
+    }
+    @media screen and (max-width: 700px) {
+        .wp99234-section.delivery_details {
+            padding-top: 15px;
+        }
+    }
+    #wp99234_use_existing_card{
+        width:auto;
+    }
+    /* Form button */
+    #wp99234_member_registration_form p.form-submit {
+        text-align: right;
+    }
+    #wp99234_member_registration_form p.form-submit input {
+        width: 260px;
+        text-align: center;
+        padding: 5px;
+    }
+    .membership_variation.hide { display:none; }
+    /* clearfix hack class */
+    .wp99234-cfix:after { content: ""; display: table; clear: both; }
+    .wp99234-membership_option p {
+        padding: 10px 5px;
+    }
+    .wp99234-section.chosen-preferences .tag, .wp99234-section.chosen-preferences .tag-editable {
+        position: relative;
+        display: inline-block;
+    }
+    .wp99234-section.chosen-preferences .tag-selected button:before,
+    .wp99234-membership_option.selected button:before {
+        content:'\2713\00a0\00a0'; /* Add check icon to selected tag */
+        white-space: pre;
+    }
+    .wp99234-membership_option:nth-child(2n+1){ clear:both; }
+    .wp99234-selected_membership,
+    .wp99234-restricted_membership {
+        /*margin-top: 1.313em;*/
+    }
+    .wp99234-section.cc_details {
+        padding-top: 15px;
+    }
+    #wp99234-create_password_section {
+        padding-top: 15px;
+    }
+    .wp99234_delivery_area {
+      display: block;
+      width: 100%;
+      min-height: 150px;
+    }
+    /* User details, CC details and delivery sections */
+    .wp99234-section.user_details,
+    .wp99234-section.cc_details,
+    .wp99234-section.delivery_details,
+    .wp99234-input_field_textfield {
+        width: 100%;
+        box-sizing: border-box;
+    }
+    @media screen and (min-width: 700px) {
+        .wp99234-section.user_details,
+        .wp99234-section.cc_details {
+            float: left;
+            width: 50%;
+            padding-right: 20px;
+        }
+        .wp99234-section.delivery_details {
+            float: right;
+            width: 50%;
+            padding-left: 20px;
+        }
+    }
+    @media screen and (max-width: 700px) {
+        .wp99234-section.delivery_details {
+            padding-top: 15px;
+        }
+    }
+    #wp99234_use_existing_card{
+        width:auto;
+    }
    #wp99234_membership_options .restricted {
       font-style: italic;
       margin-top: 1.313em;
+      font-style: italic;
+      margin-top: 1.313em;
+   }
     /* membership variation dropdown */
     .membership_variation {
         height: 43px;
         border: 1px solid #CCC;
+    }
     #wp99234-registration_shipping_instructions {
         width: 100%;
+    }
+    /* membership variation dropdown */
+    .membership_variation {
+        height: 43px;
+        border: 1px solid #CCC;
+    }
+    #wp99234-registration_shipping_instructions {
+        width: 100%;
+    }
 </style>
+<form id="wp99234_member_registration_form" class="woocommerce" action="" method="POST">
+<div class="woocommerce">
+    <form id="wp99234_member_registration_form" action="" method="POST">
     <div class="woocommerce wp99234_registration_notices">
 …
     </div>
+    <div class="wp99234-cfix">
+        <ul id="wp99234_membership_options" class="wp99234-cfix">
+        <div class="wp99234-cfix">
+            <ul id="wp99234_membership_options" class="wp99234-cfix">
+                <?php
+                $idx = 0; foreach ( apply_filters( 'wp99234_rego_form_membership_options', $membership_options ) as $membership_option ): ?>
+                    <?php
+                        /* Any membership not available to the broader public is not rendered.
+                        Public: anyone can sign up
+                        Restricted: invite-only
+                        */
+                        if( isset( $membership_option->visibility ) && !in_array( $membership_option->visibility, [ 'public', 'restricted' ] ) ) continue;
+                    ?>
+                    <li class="wp99234-membership_option
+                        <?php echo $current_membership_id == $membership_option->id ? 'selected' : 'inactive'; ?>"
+                        id="wp99234-club_<?php echo str_replace(' ', '_', strtolower($membership_option->name));?>">
+                        <h5 class="wp99234-membership_option_title"><?php echo esc_html( $membership_option->name ); ?></h5>
+                        <div class="wp99234-membership_option_details">
+                            <?php if ( !empty( $membership_option->description )) { ?>
+                            <p class="wp99234-membership-description"><?php echo $membership_option->description; ?></p>
+                            <?php } ?>
+                            <?php if ( !empty( $membership_option->benefits )) { ?>
+                            <p><a href="#" class="subs-toggle-member-benefits wp99234-membership_benefits_show">Additional benefits</a></p>
+                            <div class="wp99234-membership_benefits">
+                            <h6 class="wp99234-membership_option_member_benefits_title">Member Benefits</h6>
+                            <ul><li><?php echo implode("</li><li>",explode("\n",$membership_option->benefits)); ?></li></ul>
+                            </div>
+                        <?php } ?>
+                        </div>
+                        <?php
+                        if($current_membership_id == $membership_option->id) {
+                            echo '<div class="restricted wp99234_current_membership">You are currently a member of this club.</div>';
+                        }
+                        if( isset( $membership_option->visibility) && $membership_option->visibility == 'public') {  ?>
+                            <input type="radio" class="selected_membership_radio" name="selected_membership" value="<?php echo $membership_option->id; ?>" <?php if($current_membership_id == $membership_option->id){echo 'checked="checked"';}?> />
+                            <button class="wp99234-selected_membership button" data-original_text="<?php _e( 'Select', 'wp99234' ); ?>" data-selected_text="<?php _e( 'Selected', 'wp99234' ); ?>" data-membership_option_id="<?php echo $membership_option->id; ?>" >
+                            <?php if($current_membership_id == $membership_option->id){ _e( 'Selected', 'wp99234' );}else{ _e( 'Select', 'wp99234' );}?>
+                            </button>
+                            <!-- enable membership variations for variation membership only -->
+                            <?php if( isset($membership_option->is_variation_membership) && $membership_option->is_variation_membership ): ?>
+                                <!-- only selected variation will be set name to 'variation_id'. It will be passed to Troly for creating membership during submission -->
+                                <select id="membership_option_<?php echo $membership_option->id ?>" class="membership_variation hide" name="">
+                                    <option value='' disabled>Membership option</option>
+                                    <?php
+                                        foreach($membership_option->variations as $v_id => $v_name) {
+                                            echo "<option value=".$v_id.">".$v_name."</option>";
+                                        }
+                                    ?>
+                                </select>
+                            <?php endif; ?>
+                        <?php } else if ( isset( $membership_option->visibility ) && $membership_option->visibility == 'restricted' && $current_membership_id != $membership_option->id) { ?>
+                            <div class="restricted">You cannot currently sign up for this membership. Please contact us for further information.</div>
+                        <?php } ?>
+                    </li>
+                <?php endforeach; ?>
+            </ul>
+            <h3 class="wp99234-section_title">Membership Details</h3>
             <?php
+            $idx = 0; foreach ( apply_filters( 'wp99234_rego_form_membership_options', $membership_options ) as $membership_option ): ?>
+                <?php
+                    /* Any membership not available to the broader public is not rendered.
+                    Public: anyone can sign up
+                    Restricted: invite-only
+                    */
+                    if( isset( $membership_option->visibility ) && !in_array( $membership_option->visibility, [ 'public', 'restricted' ] ) ) continue;
+                ?>
+                <li class="wp99234-membership_option <?php if($current_membership_id == $membership_option->id){ echo 'selected'; } elseif(isset($current_membership_id)){ echo 'inactive';}?>" id="wp99234-club_<?php echo str_replace(' ', '_', strtolower($membership_option->name));?>">
+                    <h5 class="wp99234-membership_option_title"><?php echo esc_html( $membership_option->name ); ?></h5>
+                    <div class="wp99234-membership_option_details">
+                        <?php if ( !empty( $membership_option->description )) { ?>
+                        <p class="wp99234-membership-description"><?php echo $membership_option->description; ?></p>
+                        <?php } ?>
+                        <?php if ( !empty( $membership_option->benefits )) { ?>
+                        <p><a href="#" class="subs-toggle-member-benefits wp99234-membership_benefits_show">Additional benefits</a></p>
+                        <div class="wp99234-membership_benefits">
+                          <h6 class="wp99234-membership_option_member_benefits_title">Member Benefits</h6>
+                          <ul><li><?php echo implode("</li><li>",explode("\n",$membership_option->benefits)); ?></li></ul>
+                        </div>
+                      <?php } ?>
+                    </div>
+                    <?php
+                      if($current_membership_id == $membership_option->id) {
+                        echo '<div class="restricted wp99234_current_membership">You are currently a member of this club.</div>';
+                      }
+                      if( isset( $membership_option->visibility) && $membership_option->visibility == 'public') {  ?>
+                        <input type="radio" class="selected_membership_radio" name="selected_membership" value="<?php echo $membership_option->id; ?>" <?php if($current_membership_id == $membership_option->id){echo 'checked="checked"';}?> />
+                        <button class="wp99234-selected_membership button" data-original_text="<?php _e( 'Select', 'wp99234' ); ?>" data-selected_text="<?php _e( 'Selected', 'wp99234' ); ?>" data-membership_option_id="<?php echo $membership_option->id; ?>" >
+                          <?php if($current_membership_id == $membership_option->id){ _e( 'Selected', 'wp99234' );}else{ _e( 'Select', 'wp99234' );}?>
+                        </button>
+                        <!-- enable membership variations for variation membership only -->
+                        <?php if( isset($membership_option->is_variation_membership) && $membership_option->is_variation_membership ): ?>
+                            <!-- only selected variation will be set name to 'variation_id'. It will be passed to Troly for creating membership during submission -->
+                            <select id="membership_option_<?php echo $membership_option->id ?>" class="membership_variation hide" name="">
+                                <option value='' disabled>Membership option</option>
+                                <?php
+                                    foreach($membership_option->variations as $v_id => $v_name) {
+                                        echo "<option value=".$v_id.">".$v_name."</option>";
+                                    }
+                                ?>
+                            </select>
+                        <?php endif; ?>
+                    <?php } else if ( isset( $membership_option->visibility ) && $membership_option->visibility == 'restricted' && $current_membership_id != $membership_option->id) { ?>
+                        <div class="restricted">You cannot currently sign up for this membership. Please contact us for further information.</div>
+                    <?php } ?>
+                </li>
+            <?php endforeach; ?>
+        </ul>
+        <h3 class="wp99234-section_title">Membership Details</h3>
+        <?php
+            $customer_tags = get_option('troly_customer_tags');
+            $tag_ids_str = get_user_meta( $current_user->ID , 'tag_ids', true);
+            $tag_ids = explode(',', $tag_ids_str);
+            foreach($customer_tags as $id=>$tag) {
+                if (!$tag->is_public) {
+                    unset($customer_tags[$id]);
+                }
+            }
+            if (!empty($customer_tags)):
+        ?>
+        <div class="wp99234-section chosen-preferences">
+            <h4>Tell us about you</h4>
+            <ul class="tags">
+                <?php foreach($customer_tags as $tag): ?>
+                <li class="tag <?= in_array($tag->id, $tag_ids) ? 'tag-selected' : ''; ?>" customer-tag="<?= $tag->id; ?>">
+                    <button class="button"><?= $tag->name; ?></button>
+                </li>
+                <?php endforeach; ?>
+            </ul>
+            <input type="hidden" name="tag_ids" id="tag_ids" value="<?= $tag_ids_str; ?>">
+        </div>
+        <?php endif; ?>
+        <div class="wp99234-section user_details">
+            <h4 class="wp99234-section_title"><?php _e( 'Your Details', 'wp99234' ); ?></h4>
+            <div class="wp99234-section_content">
+                <?php
+                  $user_fields = array(
+                    'first_name' => array(
+                      (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'First Name', 'wp99234' ),
+                      'default' => get_user_meta( $current_user->ID, 'first_name', true ),
+                      'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_first_name')
+                    ),
+                    'last_name' => array(
+                      (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Last Name', 'wp99234' ),
+                      'default' => get_user_meta( $current_user->ID , 'last_name', true),
+                      'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_last_name' ),
+                    ),
+                    'reg_email' => array(
+                      (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Email', 'wp99234' ),
+                      'default' => ( $current_user ) ? $current_user->user_email : '' ,
+                      'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_email')
+                    ),
+                    'phone' => array(
+                      (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Phone Number', 'wp99234' ),
+                      'default' => get_user_meta( $current_user->ID , 'phone', true),
+                      'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_phone' ),
+                    ),
+                    'mobile' => array(
+                      (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Mobile Number', 'wp99234' ),
+                      'default' => get_user_meta( $current_user->ID , 'mobile', true),
+                      'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_mobile' ),
+                    ),
+                  );
+                  $legal_dob_club_option = get_option('wp99234_legal_dob_club');
+                  $isRequiredDOB = ($legal_dob_club_option == 'yes' || boolval($legal_dob_club_option)) ? true : false;
+                  if ($legal_dob_club_option != "hidden") {
+                      $user_fields['subs_birthday'] = array(
+                          (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Date of Birth', 'wp99234' ),
+                          'default' => get_user_meta( $current_user->ID , 'birthday', true),
+                          'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_birthday' ),
+                          'attributes' => array('required' => $isRequiredDOB, 'id' => 'subs_birthday')
+                      );
+                  }
+                  foreach( $user_fields as $key => $user_field ){
+                    WP99234()->_registration->display_field( $key, $user_field );
+                  }
+                ?>
+            </div>
+        </div>
+        <div class="wp99234-section delivery_details">
+            <h4 class="wp99234-section_title"><?php _e( 'Delivery Details', 'troly' ); ?></h4>
+            <div class="wp99234-section_content">
+                <?php
+                $countries_obj   = new WC_Countries();
+                $countriesArray  = $countries_obj->__get( 'countries' );
+                $delivery_fields = array(
+                    'company_name' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Company Name (optional)', 'troly' ),
+                        'default' => get_user_meta( $current_user->ID , 'shipping_company', true),
+                        'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_company_name' ),
+                    ),
+                    'shipping_address_1' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Delivery Address', 'troly' ),
+                        'default' => get_user_meta( $current_user->ID , 'shipping_address_1', true ),
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_shipping_address_1' )
+                    ),
+                    'shipping_suburb' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Suburb', 'troly' ),
+                        'default' => get_user_meta( $current_user->ID , 'shipping_city', true ),
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_shipping_suburb')
+                    ),
+                    'shipping_postcode' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Postcode', 'troly' ),
+                        'default' => get_user_meta( $current_user->ID , 'shipping_postcode', true ),
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_shipping_postcode')
+                    ),
+                    'shipping_country' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Country', 'troly' ),
+                        'default' => get_user_meta( $current_user->ID , 'shipping_country', true ),
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text'),
+                        'id' => 'troly_shipping_country',
+                        'type' => 'select',
+                        'options' => $countriesArray,
+                    ),
+                    'shipping_state' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'State', 'troly' ),
+                        'default' => get_user_meta( $current_user->ID , 'shipping_state', true ),
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'troly_shipping_state'),
+                    ),
+                    'shipping_instructions' => array(
+                        'type'  => 'textarea',
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Delivery notes and instructions (optional)', 'troly' ),
+                        'default' => get_user_meta( $current_user->ID, 'delivery_instructions', true),
+                        'attributes' => array('class' => 'wp99234-input_field_textfield input-text', 'id' => 'wp99234-registration_shipping_instructions')
+                    )
+                  );
+                  foreach( $delivery_fields as $key => $delivery_field ){
+                    WP99234()->_registration->display_field( $key, $delivery_field );
+                  }
+                  if(!is_user_logged_in()){
+                    echo '<div id="wp99234-create_password_section">';
+                    ?>
+                    <h4 class="wp99234-section_title"><?php _e( 'Create Password', 'wp99234' ); ?></h4>
+                    <?php
+                    $pass_fields = array(
+                      'user_pass' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Password', 'wp99234' ),
+                        'type' => 'password' ,
+                        'id' => 'password' ,
+                        'default' => '',
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text')
+                      ),
+                      'conf_pass' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Confirm Password', 'wp99234' ),
+                        'type' => 'password' ,
+                        'id' => 'confirm_password' ,
+                        'default' => '',
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_password')
+                      )
+                    );
+                    foreach( $pass_fields as $key => $pass_field ){
+                      WP99234()->_registration->display_field( $key, $pass_field );
+                    }
+                    echo '</div>';
+                  }
+                ?>
+            </div>
+        </div>
+        <div class="wp99234-section cc_details">
+            <h4 class="wp99234-section_title"><?php _e( 'Payment Details', 'wp99234' ); ?></h4>
+            <div class="wp99234-section_content">
+                <?php
+                $cc_fields = array(
+                    'cc_name' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Cardholder Name', 'wp99234' ),
+                        'default' => '',
+                        'attributes' => array('required' => true, 'autocomplete' => 'cc-name')
+                    ),
+                    'cc_number' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Card Number', 'wp99234' ),
+                        'default' =>'',
+                        'attributes' => array(
+                          'required' => true,
+                          'class' => 'woocommerce-Input input-text',
+                          'placeholder' => "•••• •••• •••• ••••",
+                          'maxlength' => 19,
+                          'type'=> 'tel',
+                          'inputmode'=> 'numeric',
+                          'autocomplete' => 'cc-number'
+                        )
+                    ),
+                    'cc_exp' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Card Expiry Date', 'wp99234' ),
+                        'default' => '' ,
+                        'attributes' => array(
+                            'placeholder' => 'MM / YYYY',
+                            'required' => true,
+                            'autocomplete' => 'cc-exp'
+                        ),
+                    ),
+                    'cc_cvv' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Card code', 'wp99234' ),
+                        'default' => '' ,
+                        'attributes' => array(
+                            'placeholder' => 'CVC',
+                            'required' => true,
+                            'autocomplete' => 'cc-cvv'
+                        ),
+                    )
+                );
+                $has_cc_details = false;
+                if( is_user_logged_in() ){
+                    $has_cc_meta = get_user_meta( get_current_user_id(), 'has_subs_cc_data', true );
+                    if( $has_cc_meta && $has_cc_meta == true ){
+                        $has_cc_details = true;
+                    }
+                }
+                if( $has_cc_details ){
+                    echo '<div><input type="checkbox" id="wp99234_use_existing_card" name="wp99234_use_existing_card" checked="checked" value="yes" style="width:auto;display:inline-block;"/> ' . sprintf( '<label for="wp99234_use_existing_card" style="width:auto;display:inline-block;vertical-align:middle;margin-bottom:0;margin-left:5px;">Use existing card (%s)</label></div>', get_user_meta( get_current_user_id(), 'cc_number', true ) );
+                    echo '<div id="hidden_cc_form"><br /><p>' . __( 'Card details entered here will be stored securely for future use.', 'wp99234' ) . '</p>';
+                }
+                foreach( $cc_fields as $key => $cc_field ){
+                    $css_class = null;
+                    if ($key === 'cc_exp') $css_class = 'form-row-first woocommerce-validated';
+                    if ($key === 'cc_cvv') $css_class = 'form-row-last woocommerce-validated';
+                    WP99234()->_registration->display_field( $key, $cc_field, $css_class );
+                }
+                if( $has_cc_details ){
+                    echo '</div>';
+                }
+                ?>
+            </div>
+        </div>
+        <?php
+          do_action('wp99234_preferences_form');
+        ?>
+    </div>
+    <p class="form-submit form-row">
+      <label id='message'></label>
+      <input type="hidden" name="<?php echo WP99234()->_registration->nonce_name; ?>" value="<?php echo wp_create_nonce( WP99234()->_registration->nonce_action ); ?>" />
+      <input class="button" type="submit" name="<?php echo WP99234()->_registration->submit_name; ?>" value="<?php _e( 'Sign Up Now', 'wp99234' ); ?>" id="wp99234_member_submit" />
+    </p>
+</form>
+                $customer_tags = get_option('troly_customer_tags');
+                $tag_ids_str = get_user_meta( $current_user->ID , 'tag_ids', true);
+                $tag_ids = explode(',', $tag_ids_str);
+                foreach($customer_tags as $id=>$tag) {
+                    if (!$tag->is_public) {
+                        unset($customer_tags[$id]);
+                    }
+                }
+                if (!empty($customer_tags)):
+            ?>
+            <div class="wp99234-section chosen-preferences">
+                <h4>Tell us about you</h4>
+                <ul class="tags">
+                    <?php foreach($customer_tags as $tag): ?>
+                    <li class="tag <?= in_array($tag->id, $tag_ids) ? 'tag-selected' : ''; ?>" customer-tag="<?= $tag->id; ?>">
+                        <button class="button"><?= $tag->name; ?></button>
+                    </li>
+                    <?php endforeach; ?>
+                </ul>
+                <input type="hidden" name="tag_ids" id="tag_ids" value="<?= $tag_ids_str; ?>">
+            </div>
+            <?php endif; ?>
+            <div class="wp99234-section user_details">
+                <h4 class="wp99234-section_title"><?php _e( 'Your Details', 'wp99234' ); ?></h4>
+                <div class="wp99234-section_content">
+                    <?php
+                    $user_fields = array(
+                        'first_name' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'First Name', 'wp99234' ),
+                        'default' => get_user_meta( $current_user->ID, 'first_name', true ),
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_first_name')
+                        ),
+                        'last_name' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Last Name', 'wp99234' ),
+                        'default' => get_user_meta( $current_user->ID , 'last_name', true),
+                        'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_last_name' ),
+                        ),
+                        'reg_email' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Email', 'wp99234' ),
+                        'default' => ( $current_user ) ? $current_user->user_email : '' ,
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_email')
+                        ),
+                        'phone' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Phone Number', 'wp99234' ),
+                        'default' => get_user_meta( $current_user->ID , 'phone', true),
+                        'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_phone' ),
+                        ),
+                        'mobile' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Mobile Number', 'wp99234' ),
+                        'default' => get_user_meta( $current_user->ID , 'mobile', true),
+                        'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_mobile' ),
+                        ),
+                    );
+                    $legal_dob_club_option = get_option('wp99234_legal_dob_club');
+                    $isRequiredDOB = ($legal_dob_club_option == 'yes' || boolval($legal_dob_club_option)) ? true : false;
+                    if ($legal_dob_club_option != "hidden") {
+                        $user_fields['subs_birthday'] = array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Date of Birth', 'wp99234' ),
+                            'default' => get_user_meta( $current_user->ID , 'birthday', true),
+                            'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_birthday' ),
+                            'attributes' => array('required' => $isRequiredDOB, 'id' => 'subs_birthday')
+                        );
+                    }
+                    foreach( $user_fields as $key => $user_field ){
+                        WP99234()->_registration->display_field( $key, $user_field );
+                    }
+                    ?>
+                </div>
+            </div>
+            <div class="wp99234-section delivery_details">
+                <h4 class="wp99234-section_title"><?php _e( 'Delivery Details', 'troly' ); ?></h4>
+                <div class="wp99234-section_content">
+                    <?php
+                    $countries_obj   = new WC_Countries();
+                    $countriesArray  = $countries_obj->__get( 'countries' );
+                    $delivery_fields = array(
+                        'company_name' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Company Name (optional)', 'troly' ),
+                            'default' => get_user_meta( $current_user->ID , 'shipping_company', true),
+                            'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_company_name' ),
+                        ),
+                        'shipping_address_1' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Delivery Address', 'troly' ),
+                            'default' => get_user_meta( $current_user->ID , 'shipping_address_1', true ),
+                            'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_shipping_address_1' )
+                        ),
+                        'shipping_suburb' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Suburb', 'troly' ),
+                            'default' => get_user_meta( $current_user->ID , 'shipping_city', true ),
+                            'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_shipping_suburb')
+                        ),
+                        'shipping_postcode' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Postcode', 'troly' ),
+                            'default' => get_user_meta( $current_user->ID , 'shipping_postcode', true ),
+                            'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_shipping_postcode')
+                        ),
+                        'shipping_country' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Country', 'troly' ),
+                            'default' => get_user_meta( $current_user->ID , 'shipping_country', true ),
+                            'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text'),
+                            'id' => 'troly_shipping_country',
+                            'type' => 'select',
+                            'options' => $countriesArray,
+                        ),
+                        'shipping_state' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'State', 'troly' ),
+                            'default' => get_user_meta( $current_user->ID , 'shipping_state', true ),
+                            'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'troly_shipping_state'),
+                        ),
+                        'shipping_instructions' => array(
+                            'type'  => 'textarea',
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Delivery notes and instructions (optional)', 'troly' ),
+                            'default' => get_user_meta( $current_user->ID, 'delivery_instructions', true),
+                            'attributes' => array('class' => 'wp99234-input_field_textfield input-text', 'id' => 'wp99234-registration_shipping_instructions')
+                        )
+                    );
+                    foreach( $delivery_fields as $key => $delivery_field ){
+                        WP99234()->_registration->display_field( $key, $delivery_field );
+                    }
+                    if(!is_user_logged_in()){
+                        echo '<div id="wp99234-create_password_section">';
+                        ?>
+                        <h4 class="wp99234-section_title"><?php _e( 'Create Password', 'wp99234' ); ?></h4>
+                        <?php
+                        $pass_fields = array(
+                        'user_pass' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Password', 'wp99234' ),
+                            'type' => 'password' ,
+                            'id' => 'password' ,
+                            'default' => '',
+                            'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text')
+                        ),
+                        'conf_pass' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Confirm Password', 'wp99234' ),
+                            'type' => 'password' ,
+                            'id' => 'confirm_password' ,
+                            'default' => '',
+                            'attributes' => array('required' => true, 'class' => 'wp99234-input_field_password')
+                        )
+                        );
+                        foreach( $pass_fields as $key => $pass_field ){
+                        WP99234()->_registration->display_field( $key, $pass_field );
+                        }
+                        echo '</div>';
+                    }
+                    ?>
+                </div>
+            </div>
+            <div class="wp99234-section cc_details">
+                <h4 class="wp99234-section_title"><?php _e( 'Payment Details', 'wp99234' ); ?></h4>
+                <div class="wp99234-section_content">
+                    <?php
+                    $cc_fields = array(
+                        'cc_name' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Cardholder Name', 'wp99234' ),
+                            'default' => '',
+                            'attributes' => array('required' => true, 'autocomplete' => 'cc-name')
+                        ),
+                        'cc_number' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Card Number', 'wp99234' ),
+                            'default' =>'',
+                            'attributes' => array(
+                            'required' => true,
+                            'class' => 'woocommerce-Input input-text',
+                            'placeholder' => "•••• •••• •••• ••••",
+                            'maxlength' => 19,
+                            'type'=> 'tel',
+                            'inputmode'=> 'numeric',
+                            'autocomplete' => 'cc-number'
+                            )
+                        ),
+                        'cc_exp' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Expiry Date', 'wp99234' ),
+                            'default' => '' ,
+                            'attributes' => array(
+                                'placeholder' => 'MM / YYYY',
+                                'required' => true,
+                                'autocomplete' => 'cc-exp'
+                            ),
+                        ),
+                        'cc_cvv' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Card code', 'wp99234' ),
+                            'default' => '' ,
+                            'attributes' => array(
+                                'placeholder' => 'CVC',
+                                'required' => true,
+                                'autocomplete' => 'cc-cvv'
+                            ),
+                        )
+                    );
+                    $has_cc_details = false;
+                    if( is_user_logged_in() ){
+                        $has_cc_meta = get_user_meta( get_current_user_id(), 'has_subs_cc_data', true );
+                        if( $has_cc_meta && $has_cc_meta == true ){
+                            $has_cc_details = true;
+                        }
+                    }
+                    if( $has_cc_details ){
+                        echo '<div><input type="checkbox" id="wp99234_use_existing_card" name="wp99234_use_existing_card" checked="checked" value="yes" style="width:auto;display:inline-block;"/> ' . sprintf( '<label for="wp99234_use_existing_card" style="width:auto;display:inline-block;vertical-align:middle;margin-bottom:0;margin-left:5px;">Use existing card (%s)</label></div>', get_user_meta( get_current_user_id(), 'cc_number', true ) );
+                        echo '<div id="hidden_cc_form"><br /><p>' . __( 'Card details entered here will be stored securely for future use.', 'wp99234' ) . '</p>';
+                    }
+                    foreach( $cc_fields as $key => $cc_field ){
+                        $css_class = null;
+                        if ($key === 'cc_exp') $css_class = 'form-row-first woocommerce-validated';
+                        if ($key === 'cc_cvv') $css_class = 'form-row-last woocommerce-validated';
+                        WP99234()->_registration->display_field( $key, $cc_field, $css_class );
+                    }
+                    if( $has_cc_details ){
+                        echo '</div>';
+                    }
+                    ?>
+                </div>
+            </div>
+            <?php
+            do_action('wp99234_preferences_form');
+            ?>
+        </div>
+        <p class="form-submit form-row">
+        <label id='message'></label>
+        <input type="hidden" name="<?php echo WP99234()->_registration->nonce_name; ?>" value="<?php echo wp_create_nonce( WP99234()->_registration->nonce_action ); ?>" />
+        <input class="button" type="submit" name="<?php echo WP99234()->_registration->submit_name; ?>" value="<?php _e( 'Sign Up Now', 'wp99234' ); ?>" id="wp99234_member_submit" />
+        </p>
+    </form>
+</div>
 <?php
 $limit = (int)(get_option('wp99234_legal_drinking_age'));
 …
 ?>
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         $("#subs_birthday").datepicker({
             maxDate: '-<?php echo $limit; ?>',
             changeYear: true,
             changeMonth: true,
             minDate: '-105y',
+    jQuery(document).ready(function($) {
+        $("#subs_birthday").datepicker({
+            maxDate: '-<?php echo $limit; ?>',
+            changeYear: true,
+            changeMonth: true,
+            minDate: '-105y',
             yearRange: '<?php echo ($year - 105) . ':' . ($year - $limit); ?>',
             defaultDate: '<?php echo date('F') . ' ' . date('d') . ', ' . ($year - $limit); ?>',
         });
         $('#wp99234_member_registration_form .tags .tag').click(function(e) {
             e.preventDefault();
             if ($(this).hasClass('tag-selected')) {
                 $(this).removeClass('tag-selected');
             } else {
                 $(this).addClass('tag-selected');
+            }
             var tag_ids = [];
             $('#wp99234_member_registration_form .tag').each(function(i, row) {
                 if ($(row).hasClass('tag-selected')) {
                     tag_ids.push($(row).attr('customer-tag'));
+                }
             });
             $('#tag_ids').val(tag_ids);
+        $('#wp99234_member_registration_form .tags .tag').click(function(e) {
+            e.preventDefault();
+            if ($(this).hasClass('tag-selected')) {
+                $(this).removeClass('tag-selected');
+            } else {
+                $(this).addClass('tag-selected');
+            }
+            var tag_ids = [];
+            $('#wp99234_member_registration_form .tag').each(function(i, row) {
+                if ($(row).hasClass('tag-selected')) {
+                    tag_ids.push($(row).attr('customer-tag'));
+                }
+            });
+            $('#tag_ids').val(tag_ids);
         });
 …
         $('input[name=cc_number]').on( 'blur', function(){
             if( ! jQuery.payment.validateCardNumber( $( this ).val() ) ){
+            if( ! jQuery.payment.validateCardNumber( $( this ).val() ) ){
                 $( this ).addClass( 'invalid' )
             } else {
+            } else {
                 $( this ).removeClass( 'invalid' )
+            }
+        });
+            }
+        });
+        $( '#troly_shipping_country' ).selectWoo({
+            width: '100%',
+            height: '350px'
+        })
     });
 </script>

subscribility/tags/2.9.19.5/readme.txt

-                      r2333978
+                      r2370819
 Requires at least: 4.9.0
 Tested up to: 5.4.2
 Stable Tag: 2.9.19.4
+Stable Tag: 2.9.19.5
 PHP version: 7.0 and above
 License: GPLv2 or later
 …
 ## Changelog
+###Version 2.9.19.5
+- Bug fixed with payment processing with external payment gateways.
+- Improved plugin stability and other bugs fixed.
 ###Version 2.9.19.4
 - Added plugin action links for Settings and plugin documentation.

subscribility/tags/2.9.19.5/wp99234.php

-                      r2333978
+                      r2370819
  * Plugin URI: https://wordpress.org/plugins/subscribility/
  * Description: Manage and fulfil your sales of wine, beers and other crafted beverages, through clubs and other direct-to-consumer sales channels.
  * Version: 2.9.19.4
+ * Version: 2.9.19.5
  * Author: Troly
  * Author URI: https://troly.io
 …
         include_once( 'includes/frontend/controllers/class-wp99234-template.php' );
         include_once( 'includes/frontend/controllers/class-wp99234-themes-footer.php' );
         include_once( 'includes/frontend/controllers/class-wp99234-customer-controller.php' );
         include_once( 'includes/frontend/controllers/class-wp99234-order-controller.php' );

subscribility/trunk/includes/admin/assets/css/wp99234-admin.css

r2333850	r2370819
479	479	}
480	480	.troly_log_table td span {
481		width: 80px;
	481	width: 90px;
482	482	height: 25px;
483	483	display: inline-block;

subscribility/trunk/includes/frontend/assets/css/wp99234_frontend.css

-                      r2319969
+                      r2370819
+}
 .woocommerce .woocommerce-form .password-input .show-password-input {
-    position: absolute;
-    right: .7em;
-    top: 0;
     cursor: pointer;
     text-decoration: none;
 …
+}
+#wp99234_membership_options {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+}
+#wp99234_membership_options .wp99234-membership_option {
+    list-style: none;
+    border:1px solid transparent;
+    padding:20px;
+    width: 100%;
+    margin: 0;
+}
+#wp99234_membership_options .wp99234-membership_option.selected {
+    border-color: #CCC;
+}
+#wp99234_membership_options .wp99234-membership_option.inactive {
+    opacity: 0.6;
+}
 /* @todo: Dumped styling from Patina. Needs to be amended. */
-#wp99234_member_registration_form .wp99234-membership_option {
-    width: 44% !important;
+}
-#wp99234_member_registration_form .wp99234-membership_option:nth-child(2n) {
-    margin-left: 2% !important;
+}
-#wp99234_member_registration_form .wp99234-membership_option_title {
-    color: inherit;
+}
-#wp99234_member_registration_form .wp99234-input_field_text,
-#wp99234_member_registration_form #subs_birthday,
-#wp99234_member_registration_form .cc_details input,
-#wp99234_member_registration_form .wp99234-input_field_password {
-    border: none !important;
-    padding: 15px 13px;
+}
-#wp99234_member_registration_form .wp99234-section_title {
-    color: inherit !important;
-    text-align: left !important;
+}
-#wp99234_member_registration_form p.form-row {
-    text-align: left !important;
-    padding-top: 5px;
-    padding-bottom: 5px;
+}
 #wp99234_member_registration_form .wp99234-section.chosen-preferences {
     padding-bottom: 15px;
 …
+}
-#wp99234_member_registration_form #wp99234_member_submit,
-.wp99234-selected_membership {
-    color: #ffffff;
-    font-family: 'Raleway', sans-serif;
-    font-size: 11px;
-    height: 45px;
-    font-style: normal;
-    font-weight: 700;
-    background-color: #a05f42;
-    -webkit-border-radius: 1px;
-    letter-spacing: 1px;
-    text-transform: uppercase;
-    border-width: 0px;
+}
-#wp99234-registration_shipping_instructions {
-    border: none !important;
+}
 #wp99234_member_registration_form .form-submit.form-row {
     text-align: center !important;
+}
+.form-row.shipping_instructions {
+    width: 105% !important;
+#wp99234_member_registration_form .select2-container--default .select2-selection--single {
+    height: 48px !important;
+}
+#wp99234_member_registration_form .select2-container--default .select2-selection--single .select2-selection__rendered {
+    line-height: 48px;
+}
+#wp99234_member_registration_form .select2-container--default .select2-selection--single .select2-selection__arrow {
+    height: 46px;
+}
 …
+}
-#wp99234-registration_shipping_instructions {
-    height: 115px;
+}
 #order_review table.shop_table.woocommerce-checkout-review-order-table-bak {
   width: 50% !important;
 …
+}
+#wc-wp99234_payment_gateway-cc-form input.input-text {
+ width: 98%;
+}
+#wp99234_member_registration_form .wp99234-membership_option:nth-child(2n) {
+  margin-bottom: 30px;
+}
+@media (min-width: 320px) {
+    #wp99234_member_registration_form .wp99234-membership_option {
+        width: 90% !important;
+        margin-left: 0;
+    }
+    #wp99234_member_registration_form .wp99234-membership_option:nth-child(2n) {
+      margin-left: 0 !important;
+    }
+}
+@media (min-width: 992px) {
+    #wp99234_member_registration_form .wp99234-membership_option {
+        width: 44% !important;
+    }
+    #wp99234_member_registration_form .wp99234-membership_option:nth-child(2n) {
+      margin-left: 15px !important;
+    }
+}
+.wp99234-input_field_text.input-text {
+    width: 100%;
+    font-size: 1.6rem;
+    padding: 1.5rem 1.8rem;
+}

subscribility/trunk/includes/frontend/assets/js/wp99234_frontend.js

-                      r2319969
+                      r2370819
             $("#hidden_cc_form :input").attr('required', '1');
+        }
+    });
+    });
+    /**
+     * Hide shipping calculator, shipping form if local pickup is pre-selected.
+     */
+    if ( $( 'input[type=radio].shipping_method:checked' ).length > 0 && $( 'input[type=radio].shipping_method:checked' ).val().indexOf( 'local_pickup' ) >= 0 ) {
+        $( '.woocommerce-shipping-destination, .woocommerce-shipping-calculator, .woocommerce-shipping-fields, #order_comments_field' ).hide()
+    }
+    /**
+     * Hide shipping calculator, shipping form if local pickup is selected.
+     */
+    $( 'body' ).on( 'click', 'input[type=radio].shipping_method', function() {
+        const method = $(this).val()
+        // Only trigger it once all the AJAX has stopped.
+        $( document ).ajaxStop( function() {
+            if ( method.indexOf( 'local_pickup' ) >= 0 ) {
+                $( '.woocommerce-shipping-destination, .woocommerce-shipping-calculator, .woocommerce-shipping-fields, #order_comments_field' ).hide()
+            } else {
+                $( '.woocommerce-shipping-destination, .woocommerce-shipping-calculator, .woocommerce-shipping-fields, #order_comments_field' ).show()
+            }
+        });
+    })
 });

subscribility/trunk/includes/frontend/controllers/class-wp99234-forms.php

-                      r2333850
+                      r2370819
     function display_field($key, $field, $css_class = null) {
         $type = (isset($field['type']))?$field['type']:'text';
+        $isRequired = isset( $field['attributes']['required'] ) ?? false;
         ?>
         <p class="form-row <?php echo $key . ' ' . $css_class;?>">
-        <?php /*if ( isset( $this->errors[ $key ] ) ): ?>
-        <p class="error">
-        <?php echo esc_html( $this->errors[ $key ] ); ?>
-        </p>
-        <?php endif;*/?>
         <?php
 …
             <label for="<?php echo $key;?>">
                 <?php echo $field['label'];?>
+                <?php echo $isRequired ? '<abbr class="required" title="required">*</abbr>' : ''; ?>
             </label>
         <?php

subscribility/trunk/includes/frontend/controllers/class-wp99234-order-controller.php

-                      r2333875
+                      r2370819
         $this->_orderData[ 'order' ] = [
             'source' => 'web',
             'status' => 'draft', // Why are these draft orders?
+            'status' => 'confirmed',
             'fname' => $this->_order->get_billing_first_name(),
             'lname' => $this->_order->get_billing_last_name(),
 …
             'shipment' => [
                 'name' => $this->_order->get_shipping_first_name() . ' ' . $this->_order->get_shipping_last_name(),
+                'delivery_address'  => $this->_order->get_shipping_address_1(),
+                'delivery_suburb'   => $this->_order->get_shipping_city(),
+                'delivery_postcode' => $this->_order->get_shipping_postcode(),
+                'delivery_state'    => $this->_order->get_shipping_state(),
+                'delivery_country'  => WC()->countries->countries[ $this->_order->get_shipping_country() ],
+                'same_billing'      => false,
+            ]
-        ] );
-        WP99234()->_customer->updateCustomerData( [
-            'delivery_address'  => $this->_order->get_shipping_address_1(),
-            'delivery_suburb'   => $this->_order->get_shipping_city(),
-            'delivery_postcode' => $this->_order->get_shipping_postcode(),
-            'delivery_state'    => $this->_order->get_shipping_state(),
-            'delivery_country'  => WC()->countries->countries[ $this->_order->get_shipping_country() ],
-            'same_billing'      => false,
         ] );

subscribility/trunk/includes/frontend/controllers/class-wp99234-wc-filter.php

-                      r2333850
+                      r2370819
         add_action( 'woocommerce_check_cart_items', [$this, 'wp99234_enforce_minimum_quantity'], 10 );
         add_action( 'woocommerce_cart_calculate_fees', [$this, 'wp99234_add_cart_fees'], 10, 1 );
         add_action( 'troly_order_status_check', [$this, 'check_wp99234_payment_status' ], 10, 1 );
         add_action( 'woocommerce_order_status_cancelled' , [$this, 'removeOrderStatusCheckCRON'], 10 );
+        //add_action( 'troly_order_status_check', [$this, 'check_wp99234_payment_status' ], 10, 1 );
+        //add_action( 'woocommerce_order_status_cancelled' , [$this, 'removeOrderStatusCheckCRON'], 10 );
         add_filter( 'woocommerce_is_purchasable', [$this, 'restrictMembersOnlyProducts'], 20, 2 );
         add_filter( 'woocommerce_post_class', [$this, 'addMembersOnlyClass'], 20, 2 );
         add_filter( 'woocommerce_login_redirect', [$this, 'trolySourceRedirect'], 10, 2 );
+        add_action( 'woocommerce_order_status_processing', [$this, 'exportPaymentToSubs' ], 10, 1 );
+    }
+    /**
+     * Send payment information to Troly once an order is paid or refunded
+     * in WordPress that does not use the Troly gateway.
+     *
+     * @param int $orderID
+     * @return void
+     */
+    public function exportPaymentToSubs( $orderID ) {
+        WP99234()->_woocommerce->export_payment( $orderID );
+    }
 …
     public function addMembersOnlyClass( $classes, $product )
+    {
         if ( has_term( 'visible-to-members-only', 'product_tag', $product->get_id() ) ) {
+        if ( has_term( 'purchase-by-members-only', 'product_tag', $product->get_id() ) ) {
             $classes[] = 'membersonly';
+        }
 …
     public function restrictMembersOnlyProducts( $isPurchaseable, $product )
+    {
         if ( has_term( 'visible-to-members-only', 'product_tag', $product->get_id() ) ) {
+        if ( has_term( 'purchase-by-members-only', 'product_tag', $product->get_id() ) ) {
             if ( is_user_logged_in() ) {
 …
          * @todo Using this here but not certain. Triggering the callback cron for Troly.
          */
         if ( ! wp_next_scheduled( 'troly_order_status_check' ) ) {
             wp_schedule_event( time(), '15_seconds', 'troly_order_status_check', [ $order_id ] );
+        }
+        //if ( ! wp_next_scheduled( 'troly_order_status_check' ) ) {
+        //  wp_schedule_event( time(), '15_seconds', 'troly_order_status_check', [ $order_id ] );
+        //}
         if ( isset( $response->id ) ) {
 …
      * @throws Exception
      */
+    public function export_payment( $order_id ) {
+      $order = wc_get_order($order_id);
+      $subs_id = get_post_meta( $order_id, 'subs_id', true );
+      $trx_id = $order->get_transaction_id();
+      WP99234()->logger->notice("Processing $subs_id");
+      $mtype = $order->get_payment_method();
+      WP99234()->logger->notice("Attempting to export a payment for $order_id (Troly ID $subs_id) with $mtype (TRXID $trx_id) as payment");
+      switch($mtype){
+        case 'cod':
+          $mtype = 'cash';
+          break;
+        case 'bacs':
+          $mtype = 'transfer';
+          break;
+        default:
+          $mtype = $mtype;
+          break;
+      }
+      # We set rrn to allow Stream objects to show reference
+      # This will also be set on the Payment object as well
+      $pay_data = array(
+        'order' => array (
+          'id'  => $subs_id,
+        //   'payment_type' => 'offline',
+          'payment_meth' => 'website',
+          'payment_src'  => $mtype,
+          'status' => 'confirmed' ,
+          'rrn' => $trx_id
+        ),
+        'id'  => $subs_id
+      );
+      $response = WP99234()->_api->_call( $this->payment_api_endpoint.$subs_id, $pay_data, 'PUT' );
+      if( isset( $response->channel ) ){
+            $order->add_order_note( 'Exported payment information to Troly' );
+            WP99234()->logger->notice("Succeeded exporting payment for $order_id (Troly ID $subs_id) with $mtype as payment");
+            return true;
+        } else {
+            $order->add_order_note( 'Could not export payment information to Troly' );
+            WP99234()->logger->notice("Failed exporting payment for $order_id (Troly ID $subs_id) with $mtype as payment");
+            throw new \Exception( __( 'An error has occurred. Please get in touch with us as soon as possible.', 'wp99234' ) );
+    public function export_payment( $order_id )
+    {
+        $order = wc_get_order($order_id);
+        $subs_id = get_post_meta( $order_id, 'subs_id', true );
+        $trx_id = $order->get_transaction_id();
+        $mtype = $order->get_payment_method();
+        // Do not trigger this for Troly payment gateway.
+        if ( 'wp99234_payment_gateway' !== $mtype ) {
+            WP99234()->logger->notice("Processing $subs_id");
+            WP99234()->logger->notice("Attempting to export a payment for $order_id (Troly ID $subs_id) with $mtype (TRXID $trx_id) as payment");
+            switch($mtype){
+                case 'bacs':
+                    $mtype = 'transfer';
+                    break;
+                default:
+                    $mtype = $mtype;
+                break;
+            }
+            # We set rrn to allow Stream objects to show reference
+            # This will also be set on the Payment object as well
+            $pay_data = [
+                'order' => [
+                    'id'  => $subs_id,
+                    'payment_type' => 'offline',
+                    'payment_meth' => 'website',
+                    'payment_src'  => $mtype,
+                    'status' => 'confirmed' ,
+                    'rrn' => $trx_id
+                ],
+                'id'  => $subs_id
+            ];
+            $response = WP99234()->_api->_call( $this->payment_api_endpoint.$subs_id, $pay_data, 'PUT' );
+            if ( isset( $response->channel ) ) {
+                $order->add_order_note( 'Exported payment information to Troly' );
+                WP99234()->logger->notice("Succeeded exporting payment for $order_id (Troly ID $subs_id) with $mtype as payment");
+                return true;
+            } else {
+                $order->add_order_note( 'Could not export payment information to Troly' );
+                WP99234()->logger->notice("Failed exporting payment for $order_id (Troly ID $subs_id) with $mtype as payment");
+                throw new \Exception( __( 'An error has occurred. Please get in touch with us as soon as possible.', 'wp99234' ) );
+            }
+        }
+    }
 …
         $order = new WC_Order( $order_id );
+        $rrn = $order->get_transaction_id();
         $order_status = $order->get_status() !== 'failed' ? 'in-progress' : false;
 …
         $data = array(
             'status' => 'confirmed', // $order_status
             'id'     => $subs_id,
+            'id'     => $subs_id, // maybe remove this
             'order'  => array(
                 'status'       => 'confirmed',
+                'payment_type' => $payment_type
+                'payment_type' => $payment_type,
+                'payment_meth' => 'website',
+                'payment_src'  => 'wp99234_payment_gateway',
+                'rrn' => $rrn,
+            )
         );
 …
+     *
      * @param int|string $orderID
      * @todo fix this
+     * @todo removing this since the status of orders placed via Troly gateway are begin updated already
      * @return void
      */
     public function check_wp99234_payment_status( $orderID ) {
         if ( ! $orderID ) return;
         $order = wc_get_order( $orderID );
         if ( ! $order ) return;
         $trolyOrderID = get_post_meta( $order->get_id(), 'subs_id', true );
         if ( ! $trolyOrderID || empty( $trolyOrderID) ) return;
         $endpoint = sprintf( "%sorders/%s.json", WP99234_Api::$endpoint, $trolyOrderID );
         $response = WP99234()->_api->_call( $endpoint );
         // Just taking in the case of "success" for now.
         if ( $response && is_object( $response ) && ( $response->payment_status === 'auth'
         || $response->payment_status === 'paid' ) ) {
             $order->update_status( 'processing' );
             // Removing the specific CRON after order status has been updated.
             wp_clear_scheduled_hook( 'troly_order_status_check', [ $orderID ] );
+        }
         exit;
+    }
+    //public function check_wp99234_payment_status( $orderID ) {
+    //  if ( ! $orderID ) return;
+    //  $order = wc_get_order( $orderID );
+    //  if ( ! $order ) return;
+    //  $trolyOrderID = get_post_meta( $order->get_id(), 'subs_id', true );
+    //  if ( ! $trolyOrderID || empty( $trolyOrderID) ) return;
+    //  $endpoint = sprintf( "%sorders/%s.json", WP99234_Api::$endpoint, $trolyOrderID );
+    //  $response = WP99234()->_api->_call( $endpoint );
+    //  // Just taking in the case of "success" for now.
+    //  if ( $response && is_object( $response ) && ( $response->payment_status === 'auth'
+    //  || $response->payment_status === 'paid' ) ) {
+    //      $order->update_status( 'processing' );
+    //      // Removing the specific CRON after order status has been updated.
+    //      wp_clear_scheduled_hook( 'troly_order_status_check', [ $orderID ] );
+    //  }
+    //  exit;
+    //}
     /**
 …
      * @return void
      */
     public function removeOrderStatusCheckCRON( $orderID )
+    {
         wp_clear_scheduled_hook( 'troly_order_status_check', [ $orderID ] );
+    }
+    //public function removeOrderStatusCheckCRON( $orderID )
+    //{
+    //  wp_clear_scheduled_hook( 'troly_order_status_check', [ $orderID ] );
+    //}
     /**

subscribility/trunk/includes/frontend/controllers/class-wp99234-wc-payment-gateway.php

-                      r2319969
+                      r2370819
         add_action( 'woocommerce_after_checkout_form', array($this, 'add_cc_field_toggle_js'), 6);
-        add_action( 'woocommerce_payment_complete', [ $this, 'exportPaymentToSubs' ], 10, 2);
+    }
-    /**
-     * Send payment information to Troly once an order is paid or refunded
-     * in WordPress that does not use the Troly gateway
+     *
-     * @param int $order_id
-     * @param array $posted_data
-     * @return void
-     */
-    public function exportPaymentToSubs( $order_id, $posted_data ) {
-        WP99234()->_woocommerce->export_payment( $order_id );
+    }
 …
             $return_url = $this->get_return_url( $order );
+            if( $websocket_channel ){
+                $return_url = esc_url_raw( add_query_arg( 'ws_channel', $websocket_channel, $return_url ) );
+            }
+            if ( $websocket_channel ) {
+                $order->update_status( 'processing' );
+                $return_url = esc_url_raw( add_query_arg( 'ws_channel', $websocket_channel, $return_url ) );
+            }
             // Return thankyou redirect

subscribility/trunk/includes/frontend/views/newsletter_form.php

-                      r2319969
+                      r2370819
 </style>
+<form id="newsletter_registration_form" action="#newsletter_registration_form" method="POST">
+<div class="woocommerce">
+    <form id="newsletter_registration_form" action="#newsletter_registration_form" method="POST">
     <div class="woocommerce">
         <?php if ( !is_admin() ) { if ( function_exists('wc_print_notices') ) { wc_print_notices(); } } ?>
     </div>
+        <div class="woocommerce">
+            <?php if ( !is_admin() ) { if ( function_exists('wc_print_notices') ) { wc_print_notices(); } } ?>
+        </div>
     <div class="cfix">
+        <div class="cfix">
+        <?php $fields = array(
+            'first_name' => array(
+                (get_option('wp99234_newsletter_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'First Name', 'wp99234' ),
+                'default' => '',
+            ),
+            'reg_email' => array(
+                (get_option('wp99234_newsletter_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Email', 'wp99234' ),
+                'default' => '',
+            ),
+        );
+            <?php $fields = array(
+                'first_name' => array(
+                    (get_option('wp99234_newsletter_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'First Name', 'wp99234' ),
+                    'default' => '',
+                    'attributes' => [
+                        'class' => 'input-text',
+                    ],
+                ),
+                'reg_email' => array(
+                    (get_option('wp99234_newsletter_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Email', 'wp99234' ),
+                    'default' => '',
+                    'attributes' => [
+                        'class' => 'input-text',
+                    ],
+                ),
+            );
+        if ( get_option('wp99234_newsletter_collect_mobile') == 'yes' ) {
+          $fields['mobile'] = array(
+              ( get_option( 'wp99234_newsletter_use_placeholders' ) == 'yes' ? 'placeholder' : 'label' ) => __( 'Mobile', 'wp99234' ),
+              'default' => '',
+          );
+        }
+            if ( get_option('wp99234_newsletter_collect_mobile') == 'yes' ) {
+            $fields['mobile'] = array(
+                ( get_option( 'wp99234_newsletter_use_placeholders' ) == 'yes' ? 'placeholder' : 'label' ) => __( 'Mobile', 'wp99234' ),
+                'default' => '',
+                'attributes' => [
+                    'class' => 'input-text',
+                ],
+            );
+            }
         // Only show Postcode if not 'hidden'
         if ( get_option('wp99234_newsletter_collect_postcode') != 'hidden' ) {
           $fields['postcode'] = array(
               ( get_option( 'wp99234_newsletter_use_placeholders' ) == 'yes' ? 'placeholder' : 'label' ) => __( 'Postcode', 'wp99234' ),
               'default' => '',
           );
+        }
+            // Only show Postcode if not 'hidden'
+            if ( get_option('wp99234_newsletter_collect_postcode') != 'hidden' ) {
+            $fields['postcode'] = array(
+                ( get_option( 'wp99234_newsletter_use_placeholders' ) == 'yes' ? 'placeholder' : 'label' ) => __( 'Postcode', 'wp99234' ),
+                'default' => '',
+            );
+            }
         ?>
+            ?>
         <?php foreach( $fields as $key => $field ){
             WP99234()->_newsletter->display_field( $key, $field );
         } ?>
+            <?php foreach( $fields as $key => $field ){
+                WP99234()->_newsletter->display_field( $key, $field );
+            } ?>
         <p class="form-submit form-row">
             <input type="hidden" name="<?php echo WP99234()->_newsletter->nonce_name; ?>" value="<?php echo wp_create_nonce( WP99234()->_newsletter->nonce_action ); ?>" />
             <input type="submit" name="<?php echo WP99234()->_newsletter->submit_name; ?>" value="<?php _e( 'Sign Up Now', 'wp99234' ); ?>" class="wp99234-newsletter-signup-button" />
         </p>
+            <p class="form-submit form-row">
+                <input type="hidden" name="<?php echo WP99234()->_newsletter->nonce_name; ?>" value="<?php echo wp_create_nonce( WP99234()->_newsletter->nonce_action ); ?>" />
+                <input type="submit" name="<?php echo WP99234()->_newsletter->submit_name; ?>" value="<?php _e( 'Sign Up Now', 'wp99234' ); ?>" class="wp99234-newsletter-signup-button" />
+            </p>
     </div>
+        </div>
+</form>
+    </form>
+</div>

subscribility/trunk/includes/frontend/views/registration_form.php

-                      r2333850
+                      r2370819
   $current_membership_id = 'null';
+// Enqueue credit card validator logics.
 wp_enqueue_script( 'jquery-payment-troly' );
 echo "\n\n".'<script type="text/javascript">window.troly_current_membership_id = '.$current_membership_id.';</script>'."\n\n";
+// Enqueue WooCommerce styling and functions for dropdown elements.
+wp_enqueue_style( 'select2' );
+wp_enqueue_script( 'selectWoo' );
 get_header();
 ?>
 <style type="text/css">
+    .membership_variation.hide { display:none; }
+    /* clearfix hack class */
+    .wp99234-cfix:after { content: ""; display: table; clear: both; }
+    li.wp99234-membership_option {
+        list-style:none;
+        border:1px solid transparent;
+        float:left;
+        padding:20px;
+        margin-bottom:4%;
+        width: 100%;
+        position: relative;
+    }
+    .wp99234-membership_option p {
+        padding: 10px 5px;
+    }
+    /* Emphasize input fields to inverse background */
+    .wp99234-input_field_text, #subs_birthday,
+    .wp99234-input_field_password,
+    .wp99234-input_field_textfield,
+    .wp99234-section.cc_details input[type="text"],
+    .wp99234-section.cc_details input[type="tel"] {
+        border-bottom: 1px solid gray;
+    }
+    .wp99234-section.chosen-preferences .tags {
+        margin-top: 5px;
+    }
+    .wp99234-section.chosen-preferences .tag, .wp99234-section.chosen-preferences .tag-editable {
+        position: relative;
+        display: inline-block;
+    }
+    .wp99234-section.chosen-preferences .tag-selected button:before,
+    .wp99234-membership_option.selected button:before {
+        content:'\2713\00a0\00a0'; /* Add check icon to selected tag */
+        white-space: pre;
+    }
+    .wp99234-membership_option:nth-child(2n+1){ clear:both; }
+    .wp99234-membership_option.selected{
+        border: 1px solid #CCC;
+    }
+    .wp99234-selected_membership,
+    .wp99234-restricted_membership {
+        /*margin-top: 1.313em;*/
+    }
+    .wp99234-section.cc_details {
+        padding-top: 15px;
+    }
+    #wp99234-create_password_section {
+        padding-top: 15px;
+    }
+    #wp99234_member_submit {
+        padding: 5px;
+        height: auto;
+    }
+    @media screen and (min-width: 700px) {
+        .wp99234-membership_option:nth-child(2n){
+            margin-left:4%;
+        }
+        .wp99234-membership_option{
+            width:46%;
+            float:left;
+        }
+    }
+    .wp99234_delivery_area {
+      display: block;
+      width: 100%;
+      min-height: 150px;
+    }
+    /* User details, CC details and delivery sections */
+    .wp99234-section.user_details,
+    .wp99234-section.cc_details,
+    .wp99234-section.delivery_details,
+    .wp99234-input_field_textfield {
+        width: 100%;
+        box-sizing: border-box;
+    }
+    @media screen and (min-width: 700px) {
+        .wp99234-section.user_details,
+        .wp99234-section.cc_details {
+            float: left;
+            width: 50%;
+            padding-right: 20px;
+        }
+        .wp99234-section.delivery_details {
+            float: right;
+            width: 50%;
+            padding-left: 20px;
+        }
+    }
+    .wp99234-section.user_details label,
+    .wp99234-section.cc_details label,
+    .wp99234-section.delivery_details label,
+    .wp99234-section.user_details input,
+    .wp99234-section.cc_details input,
+    .wp99234-section.delivery_details input {
+        width: 100%;
+    }
+    @media screen and (max-width: 700px) {
+        .wp99234-section.delivery_details {
+            padding-top: 15px;
+        }
+    }
+    #wp99234_use_existing_card{
+        width:auto;
+    }
+    /* Form button */
+    #wp99234_member_registration_form p.form-submit {
+        text-align: right;
+    }
+    #wp99234_member_registration_form p.form-submit input {
+        width: 260px;
+        text-align: center;
+        padding: 5px;
+    }
+    .membership_variation.hide { display:none; }
+    /* clearfix hack class */
+    .wp99234-cfix:after { content: ""; display: table; clear: both; }
+    .wp99234-membership_option p {
+        padding: 10px 5px;
+    }
+    .wp99234-section.chosen-preferences .tag, .wp99234-section.chosen-preferences .tag-editable {
+        position: relative;
+        display: inline-block;
+    }
+    .wp99234-section.chosen-preferences .tag-selected button:before,
+    .wp99234-membership_option.selected button:before {
+        content:'\2713\00a0\00a0'; /* Add check icon to selected tag */
+        white-space: pre;
+    }
+    .wp99234-membership_option:nth-child(2n+1){ clear:both; }
+    .wp99234-selected_membership,
+    .wp99234-restricted_membership {
+        /*margin-top: 1.313em;*/
+    }
+    .wp99234-section.cc_details {
+        padding-top: 15px;
+    }
+    #wp99234-create_password_section {
+        padding-top: 15px;
+    }
+    .wp99234_delivery_area {
+      display: block;
+      width: 100%;
+      min-height: 150px;
+    }
+    /* User details, CC details and delivery sections */
+    .wp99234-section.user_details,
+    .wp99234-section.cc_details,
+    .wp99234-section.delivery_details,
+    .wp99234-input_field_textfield {
+        width: 100%;
+        box-sizing: border-box;
+    }
+    @media screen and (min-width: 700px) {
+        .wp99234-section.user_details,
+        .wp99234-section.cc_details {
+            float: left;
+            width: 50%;
+            padding-right: 20px;
+        }
+        .wp99234-section.delivery_details {
+            float: right;
+            width: 50%;
+            padding-left: 20px;
+        }
+    }
+    @media screen and (max-width: 700px) {
+        .wp99234-section.delivery_details {
+            padding-top: 15px;
+        }
+    }
+    #wp99234_use_existing_card{
+        width:auto;
+    }
    #wp99234_membership_options .restricted {
       font-style: italic;
       margin-top: 1.313em;
+      font-style: italic;
+      margin-top: 1.313em;
+   }
     /* membership variation dropdown */
     .membership_variation {
         height: 43px;
         border: 1px solid #CCC;
+    }
     #wp99234-registration_shipping_instructions {
         width: 100%;
+    }
+    /* membership variation dropdown */
+    .membership_variation {
+        height: 43px;
+        border: 1px solid #CCC;
+    }
+    #wp99234-registration_shipping_instructions {
+        width: 100%;
+    }
 </style>
+<form id="wp99234_member_registration_form" class="woocommerce" action="" method="POST">
+<div class="woocommerce">
+    <form id="wp99234_member_registration_form" action="" method="POST">
     <div class="woocommerce wp99234_registration_notices">
 …
     </div>
+    <div class="wp99234-cfix">
+        <ul id="wp99234_membership_options" class="wp99234-cfix">
+        <div class="wp99234-cfix">
+            <ul id="wp99234_membership_options" class="wp99234-cfix">
+                <?php
+                $idx = 0; foreach ( apply_filters( 'wp99234_rego_form_membership_options', $membership_options ) as $membership_option ): ?>
+                    <?php
+                        /* Any membership not available to the broader public is not rendered.
+                        Public: anyone can sign up
+                        Restricted: invite-only
+                        */
+                        if( isset( $membership_option->visibility ) && !in_array( $membership_option->visibility, [ 'public', 'restricted' ] ) ) continue;
+                    ?>
+                    <li class="wp99234-membership_option
+                        <?php echo $current_membership_id == $membership_option->id ? 'selected' : 'inactive'; ?>"
+                        id="wp99234-club_<?php echo str_replace(' ', '_', strtolower($membership_option->name));?>">
+                        <h5 class="wp99234-membership_option_title"><?php echo esc_html( $membership_option->name ); ?></h5>
+                        <div class="wp99234-membership_option_details">
+                            <?php if ( !empty( $membership_option->description )) { ?>
+                            <p class="wp99234-membership-description"><?php echo $membership_option->description; ?></p>
+                            <?php } ?>
+                            <?php if ( !empty( $membership_option->benefits )) { ?>
+                            <p><a href="#" class="subs-toggle-member-benefits wp99234-membership_benefits_show">Additional benefits</a></p>
+                            <div class="wp99234-membership_benefits">
+                            <h6 class="wp99234-membership_option_member_benefits_title">Member Benefits</h6>
+                            <ul><li><?php echo implode("</li><li>",explode("\n",$membership_option->benefits)); ?></li></ul>
+                            </div>
+                        <?php } ?>
+                        </div>
+                        <?php
+                        if($current_membership_id == $membership_option->id) {
+                            echo '<div class="restricted wp99234_current_membership">You are currently a member of this club.</div>';
+                        }
+                        if( isset( $membership_option->visibility) && $membership_option->visibility == 'public') {  ?>
+                            <input type="radio" class="selected_membership_radio" name="selected_membership" value="<?php echo $membership_option->id; ?>" <?php if($current_membership_id == $membership_option->id){echo 'checked="checked"';}?> />
+                            <button class="wp99234-selected_membership button" data-original_text="<?php _e( 'Select', 'wp99234' ); ?>" data-selected_text="<?php _e( 'Selected', 'wp99234' ); ?>" data-membership_option_id="<?php echo $membership_option->id; ?>" >
+                            <?php if($current_membership_id == $membership_option->id){ _e( 'Selected', 'wp99234' );}else{ _e( 'Select', 'wp99234' );}?>
+                            </button>
+                            <!-- enable membership variations for variation membership only -->
+                            <?php if( isset($membership_option->is_variation_membership) && $membership_option->is_variation_membership ): ?>
+                                <!-- only selected variation will be set name to 'variation_id'. It will be passed to Troly for creating membership during submission -->
+                                <select id="membership_option_<?php echo $membership_option->id ?>" class="membership_variation hide" name="">
+                                    <option value='' disabled>Membership option</option>
+                                    <?php
+                                        foreach($membership_option->variations as $v_id => $v_name) {
+                                            echo "<option value=".$v_id.">".$v_name."</option>";
+                                        }
+                                    ?>
+                                </select>
+                            <?php endif; ?>
+                        <?php } else if ( isset( $membership_option->visibility ) && $membership_option->visibility == 'restricted' && $current_membership_id != $membership_option->id) { ?>
+                            <div class="restricted">You cannot currently sign up for this membership. Please contact us for further information.</div>
+                        <?php } ?>
+                    </li>
+                <?php endforeach; ?>
+            </ul>
+            <h3 class="wp99234-section_title">Membership Details</h3>
             <?php
+            $idx = 0; foreach ( apply_filters( 'wp99234_rego_form_membership_options', $membership_options ) as $membership_option ): ?>
+                <?php
+                    /* Any membership not available to the broader public is not rendered.
+                    Public: anyone can sign up
+                    Restricted: invite-only
+                    */
+                    if( isset( $membership_option->visibility ) && !in_array( $membership_option->visibility, [ 'public', 'restricted' ] ) ) continue;
+                ?>
+                <li class="wp99234-membership_option <?php if($current_membership_id == $membership_option->id){ echo 'selected'; } elseif(isset($current_membership_id)){ echo 'inactive';}?>" id="wp99234-club_<?php echo str_replace(' ', '_', strtolower($membership_option->name));?>">
+                    <h5 class="wp99234-membership_option_title"><?php echo esc_html( $membership_option->name ); ?></h5>
+                    <div class="wp99234-membership_option_details">
+                        <?php if ( !empty( $membership_option->description )) { ?>
+                        <p class="wp99234-membership-description"><?php echo $membership_option->description; ?></p>
+                        <?php } ?>
+                        <?php if ( !empty( $membership_option->benefits )) { ?>
+                        <p><a href="#" class="subs-toggle-member-benefits wp99234-membership_benefits_show">Additional benefits</a></p>
+                        <div class="wp99234-membership_benefits">
+                          <h6 class="wp99234-membership_option_member_benefits_title">Member Benefits</h6>
+                          <ul><li><?php echo implode("</li><li>",explode("\n",$membership_option->benefits)); ?></li></ul>
+                        </div>
+                      <?php } ?>
+                    </div>
+                    <?php
+                      if($current_membership_id == $membership_option->id) {
+                        echo '<div class="restricted wp99234_current_membership">You are currently a member of this club.</div>';
+                      }
+                      if( isset( $membership_option->visibility) && $membership_option->visibility == 'public') {  ?>
+                        <input type="radio" class="selected_membership_radio" name="selected_membership" value="<?php echo $membership_option->id; ?>" <?php if($current_membership_id == $membership_option->id){echo 'checked="checked"';}?> />
+                        <button class="wp99234-selected_membership button" data-original_text="<?php _e( 'Select', 'wp99234' ); ?>" data-selected_text="<?php _e( 'Selected', 'wp99234' ); ?>" data-membership_option_id="<?php echo $membership_option->id; ?>" >
+                          <?php if($current_membership_id == $membership_option->id){ _e( 'Selected', 'wp99234' );}else{ _e( 'Select', 'wp99234' );}?>
+                        </button>
+                        <!-- enable membership variations for variation membership only -->
+                        <?php if( isset($membership_option->is_variation_membership) && $membership_option->is_variation_membership ): ?>
+                            <!-- only selected variation will be set name to 'variation_id'. It will be passed to Troly for creating membership during submission -->
+                            <select id="membership_option_<?php echo $membership_option->id ?>" class="membership_variation hide" name="">
+                                <option value='' disabled>Membership option</option>
+                                <?php
+                                    foreach($membership_option->variations as $v_id => $v_name) {
+                                        echo "<option value=".$v_id.">".$v_name."</option>";
+                                    }
+                                ?>
+                            </select>
+                        <?php endif; ?>
+                    <?php } else if ( isset( $membership_option->visibility ) && $membership_option->visibility == 'restricted' && $current_membership_id != $membership_option->id) { ?>
+                        <div class="restricted">You cannot currently sign up for this membership. Please contact us for further information.</div>
+                    <?php } ?>
+                </li>
+            <?php endforeach; ?>
+        </ul>
+        <h3 class="wp99234-section_title">Membership Details</h3>
+        <?php
+            $customer_tags = get_option('troly_customer_tags');
+            $tag_ids_str = get_user_meta( $current_user->ID , 'tag_ids', true);
+            $tag_ids = explode(',', $tag_ids_str);
+            foreach($customer_tags as $id=>$tag) {
+                if (!$tag->is_public) {
+                    unset($customer_tags[$id]);
+                }
+            }
+            if (!empty($customer_tags)):
+        ?>
+        <div class="wp99234-section chosen-preferences">
+            <h4>Tell us about you</h4>
+            <ul class="tags">
+                <?php foreach($customer_tags as $tag): ?>
+                <li class="tag <?= in_array($tag->id, $tag_ids) ? 'tag-selected' : ''; ?>" customer-tag="<?= $tag->id; ?>">
+                    <button class="button"><?= $tag->name; ?></button>
+                </li>
+                <?php endforeach; ?>
+            </ul>
+            <input type="hidden" name="tag_ids" id="tag_ids" value="<?= $tag_ids_str; ?>">
+        </div>
+        <?php endif; ?>
+        <div class="wp99234-section user_details">
+            <h4 class="wp99234-section_title"><?php _e( 'Your Details', 'wp99234' ); ?></h4>
+            <div class="wp99234-section_content">
+                <?php
+                  $user_fields = array(
+                    'first_name' => array(
+                      (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'First Name', 'wp99234' ),
+                      'default' => get_user_meta( $current_user->ID, 'first_name', true ),
+                      'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_first_name')
+                    ),
+                    'last_name' => array(
+                      (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Last Name', 'wp99234' ),
+                      'default' => get_user_meta( $current_user->ID , 'last_name', true),
+                      'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_last_name' ),
+                    ),
+                    'reg_email' => array(
+                      (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Email', 'wp99234' ),
+                      'default' => ( $current_user ) ? $current_user->user_email : '' ,
+                      'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_email')
+                    ),
+                    'phone' => array(
+                      (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Phone Number', 'wp99234' ),
+                      'default' => get_user_meta( $current_user->ID , 'phone', true),
+                      'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_phone' ),
+                    ),
+                    'mobile' => array(
+                      (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Mobile Number', 'wp99234' ),
+                      'default' => get_user_meta( $current_user->ID , 'mobile', true),
+                      'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_mobile' ),
+                    ),
+                  );
+                  $legal_dob_club_option = get_option('wp99234_legal_dob_club');
+                  $isRequiredDOB = ($legal_dob_club_option == 'yes' || boolval($legal_dob_club_option)) ? true : false;
+                  if ($legal_dob_club_option != "hidden") {
+                      $user_fields['subs_birthday'] = array(
+                          (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Date of Birth', 'wp99234' ),
+                          'default' => get_user_meta( $current_user->ID , 'birthday', true),
+                          'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_birthday' ),
+                          'attributes' => array('required' => $isRequiredDOB, 'id' => 'subs_birthday')
+                      );
+                  }
+                  foreach( $user_fields as $key => $user_field ){
+                    WP99234()->_registration->display_field( $key, $user_field );
+                  }
+                ?>
+            </div>
+        </div>
+        <div class="wp99234-section delivery_details">
+            <h4 class="wp99234-section_title"><?php _e( 'Delivery Details', 'troly' ); ?></h4>
+            <div class="wp99234-section_content">
+                <?php
+                $countries_obj   = new WC_Countries();
+                $countriesArray  = $countries_obj->__get( 'countries' );
+                $delivery_fields = array(
+                    'company_name' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Company Name (optional)', 'troly' ),
+                        'default' => get_user_meta( $current_user->ID , 'shipping_company', true),
+                        'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_company_name' ),
+                    ),
+                    'shipping_address_1' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Delivery Address', 'troly' ),
+                        'default' => get_user_meta( $current_user->ID , 'shipping_address_1', true ),
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_shipping_address_1' )
+                    ),
+                    'shipping_suburb' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Suburb', 'troly' ),
+                        'default' => get_user_meta( $current_user->ID , 'shipping_city', true ),
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_shipping_suburb')
+                    ),
+                    'shipping_postcode' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Postcode', 'troly' ),
+                        'default' => get_user_meta( $current_user->ID , 'shipping_postcode', true ),
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_shipping_postcode')
+                    ),
+                    'shipping_country' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Country', 'troly' ),
+                        'default' => get_user_meta( $current_user->ID , 'shipping_country', true ),
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text'),
+                        'id' => 'troly_shipping_country',
+                        'type' => 'select',
+                        'options' => $countriesArray,
+                    ),
+                    'shipping_state' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'State', 'troly' ),
+                        'default' => get_user_meta( $current_user->ID , 'shipping_state', true ),
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'troly_shipping_state'),
+                    ),
+                    'shipping_instructions' => array(
+                        'type'  => 'textarea',
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Delivery notes and instructions (optional)', 'troly' ),
+                        'default' => get_user_meta( $current_user->ID, 'delivery_instructions', true),
+                        'attributes' => array('class' => 'wp99234-input_field_textfield input-text', 'id' => 'wp99234-registration_shipping_instructions')
+                    )
+                  );
+                  foreach( $delivery_fields as $key => $delivery_field ){
+                    WP99234()->_registration->display_field( $key, $delivery_field );
+                  }
+                  if(!is_user_logged_in()){
+                    echo '<div id="wp99234-create_password_section">';
+                    ?>
+                    <h4 class="wp99234-section_title"><?php _e( 'Create Password', 'wp99234' ); ?></h4>
+                    <?php
+                    $pass_fields = array(
+                      'user_pass' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Password', 'wp99234' ),
+                        'type' => 'password' ,
+                        'id' => 'password' ,
+                        'default' => '',
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text')
+                      ),
+                      'conf_pass' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Confirm Password', 'wp99234' ),
+                        'type' => 'password' ,
+                        'id' => 'confirm_password' ,
+                        'default' => '',
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_password')
+                      )
+                    );
+                    foreach( $pass_fields as $key => $pass_field ){
+                      WP99234()->_registration->display_field( $key, $pass_field );
+                    }
+                    echo '</div>';
+                  }
+                ?>
+            </div>
+        </div>
+        <div class="wp99234-section cc_details">
+            <h4 class="wp99234-section_title"><?php _e( 'Payment Details', 'wp99234' ); ?></h4>
+            <div class="wp99234-section_content">
+                <?php
+                $cc_fields = array(
+                    'cc_name' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Cardholder Name', 'wp99234' ),
+                        'default' => '',
+                        'attributes' => array('required' => true, 'autocomplete' => 'cc-name')
+                    ),
+                    'cc_number' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Card Number', 'wp99234' ),
+                        'default' =>'',
+                        'attributes' => array(
+                          'required' => true,
+                          'class' => 'woocommerce-Input input-text',
+                          'placeholder' => "•••• •••• •••• ••••",
+                          'maxlength' => 19,
+                          'type'=> 'tel',
+                          'inputmode'=> 'numeric',
+                          'autocomplete' => 'cc-number'
+                        )
+                    ),
+                    'cc_exp' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Card Expiry Date', 'wp99234' ),
+                        'default' => '' ,
+                        'attributes' => array(
+                            'placeholder' => 'MM / YYYY',
+                            'required' => true,
+                            'autocomplete' => 'cc-exp'
+                        ),
+                    ),
+                    'cc_cvv' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Card code', 'wp99234' ),
+                        'default' => '' ,
+                        'attributes' => array(
+                            'placeholder' => 'CVC',
+                            'required' => true,
+                            'autocomplete' => 'cc-cvv'
+                        ),
+                    )
+                );
+                $has_cc_details = false;
+                if( is_user_logged_in() ){
+                    $has_cc_meta = get_user_meta( get_current_user_id(), 'has_subs_cc_data', true );
+                    if( $has_cc_meta && $has_cc_meta == true ){
+                        $has_cc_details = true;
+                    }
+                }
+                if( $has_cc_details ){
+                    echo '<div><input type="checkbox" id="wp99234_use_existing_card" name="wp99234_use_existing_card" checked="checked" value="yes" style="width:auto;display:inline-block;"/> ' . sprintf( '<label for="wp99234_use_existing_card" style="width:auto;display:inline-block;vertical-align:middle;margin-bottom:0;margin-left:5px;">Use existing card (%s)</label></div>', get_user_meta( get_current_user_id(), 'cc_number', true ) );
+                    echo '<div id="hidden_cc_form"><br /><p>' . __( 'Card details entered here will be stored securely for future use.', 'wp99234' ) . '</p>';
+                }
+                foreach( $cc_fields as $key => $cc_field ){
+                    $css_class = null;
+                    if ($key === 'cc_exp') $css_class = 'form-row-first woocommerce-validated';
+                    if ($key === 'cc_cvv') $css_class = 'form-row-last woocommerce-validated';
+                    WP99234()->_registration->display_field( $key, $cc_field, $css_class );
+                }
+                if( $has_cc_details ){
+                    echo '</div>';
+                }
+                ?>
+            </div>
+        </div>
+        <?php
+          do_action('wp99234_preferences_form');
+        ?>
+    </div>
+    <p class="form-submit form-row">
+      <label id='message'></label>
+      <input type="hidden" name="<?php echo WP99234()->_registration->nonce_name; ?>" value="<?php echo wp_create_nonce( WP99234()->_registration->nonce_action ); ?>" />
+      <input class="button" type="submit" name="<?php echo WP99234()->_registration->submit_name; ?>" value="<?php _e( 'Sign Up Now', 'wp99234' ); ?>" id="wp99234_member_submit" />
+    </p>
+</form>
+                $customer_tags = get_option('troly_customer_tags');
+                $tag_ids_str = get_user_meta( $current_user->ID , 'tag_ids', true);
+                $tag_ids = explode(',', $tag_ids_str);
+                foreach($customer_tags as $id=>$tag) {
+                    if (!$tag->is_public) {
+                        unset($customer_tags[$id]);
+                    }
+                }
+                if (!empty($customer_tags)):
+            ?>
+            <div class="wp99234-section chosen-preferences">
+                <h4>Tell us about you</h4>
+                <ul class="tags">
+                    <?php foreach($customer_tags as $tag): ?>
+                    <li class="tag <?= in_array($tag->id, $tag_ids) ? 'tag-selected' : ''; ?>" customer-tag="<?= $tag->id; ?>">
+                        <button class="button"><?= $tag->name; ?></button>
+                    </li>
+                    <?php endforeach; ?>
+                </ul>
+                <input type="hidden" name="tag_ids" id="tag_ids" value="<?= $tag_ids_str; ?>">
+            </div>
+            <?php endif; ?>
+            <div class="wp99234-section user_details">
+                <h4 class="wp99234-section_title"><?php _e( 'Your Details', 'wp99234' ); ?></h4>
+                <div class="wp99234-section_content">
+                    <?php
+                    $user_fields = array(
+                        'first_name' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'First Name', 'wp99234' ),
+                        'default' => get_user_meta( $current_user->ID, 'first_name', true ),
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_first_name')
+                        ),
+                        'last_name' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Last Name', 'wp99234' ),
+                        'default' => get_user_meta( $current_user->ID , 'last_name', true),
+                        'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_last_name' ),
+                        ),
+                        'reg_email' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Email', 'wp99234' ),
+                        'default' => ( $current_user ) ? $current_user->user_email : '' ,
+                        'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_email')
+                        ),
+                        'phone' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Phone Number', 'wp99234' ),
+                        'default' => get_user_meta( $current_user->ID , 'phone', true),
+                        'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_phone' ),
+                        ),
+                        'mobile' => array(
+                        (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Mobile Number', 'wp99234' ),
+                        'default' => get_user_meta( $current_user->ID , 'mobile', true),
+                        'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_mobile' ),
+                        ),
+                    );
+                    $legal_dob_club_option = get_option('wp99234_legal_dob_club');
+                    $isRequiredDOB = ($legal_dob_club_option == 'yes' || boolval($legal_dob_club_option)) ? true : false;
+                    if ($legal_dob_club_option != "hidden") {
+                        $user_fields['subs_birthday'] = array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Date of Birth', 'wp99234' ),
+                            'default' => get_user_meta( $current_user->ID , 'birthday', true),
+                            'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_birthday' ),
+                            'attributes' => array('required' => $isRequiredDOB, 'id' => 'subs_birthday')
+                        );
+                    }
+                    foreach( $user_fields as $key => $user_field ){
+                        WP99234()->_registration->display_field( $key, $user_field );
+                    }
+                    ?>
+                </div>
+            </div>
+            <div class="wp99234-section delivery_details">
+                <h4 class="wp99234-section_title"><?php _e( 'Delivery Details', 'troly' ); ?></h4>
+                <div class="wp99234-section_content">
+                    <?php
+                    $countries_obj   = new WC_Countries();
+                    $countriesArray  = $countries_obj->__get( 'countries' );
+                    $delivery_fields = array(
+                        'company_name' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Company Name (optional)', 'troly' ),
+                            'default' => get_user_meta( $current_user->ID , 'shipping_company', true),
+                            'attributes' => array('class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_company_name' ),
+                        ),
+                        'shipping_address_1' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Delivery Address', 'troly' ),
+                            'default' => get_user_meta( $current_user->ID , 'shipping_address_1', true ),
+                            'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_shipping_address_1' )
+                        ),
+                        'shipping_suburb' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Suburb', 'troly' ),
+                            'default' => get_user_meta( $current_user->ID , 'shipping_city', true ),
+                            'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_shipping_suburb')
+                        ),
+                        'shipping_postcode' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Postcode', 'troly' ),
+                            'default' => get_user_meta( $current_user->ID , 'shipping_postcode', true ),
+                            'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'wp99234-registration_shipping_postcode')
+                        ),
+                        'shipping_country' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Country', 'troly' ),
+                            'default' => get_user_meta( $current_user->ID , 'shipping_country', true ),
+                            'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text'),
+                            'id' => 'troly_shipping_country',
+                            'type' => 'select',
+                            'options' => $countriesArray,
+                        ),
+                        'shipping_state' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'State', 'troly' ),
+                            'default' => get_user_meta( $current_user->ID , 'shipping_state', true ),
+                            'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text input-text', 'id' => 'troly_shipping_state'),
+                        ),
+                        'shipping_instructions' => array(
+                            'type'  => 'textarea',
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Delivery notes and instructions (optional)', 'troly' ),
+                            'default' => get_user_meta( $current_user->ID, 'delivery_instructions', true),
+                            'attributes' => array('class' => 'wp99234-input_field_textfield input-text', 'id' => 'wp99234-registration_shipping_instructions')
+                        )
+                    );
+                    foreach( $delivery_fields as $key => $delivery_field ){
+                        WP99234()->_registration->display_field( $key, $delivery_field );
+                    }
+                    if(!is_user_logged_in()){
+                        echo '<div id="wp99234-create_password_section">';
+                        ?>
+                        <h4 class="wp99234-section_title"><?php _e( 'Create Password', 'wp99234' ); ?></h4>
+                        <?php
+                        $pass_fields = array(
+                        'user_pass' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Password', 'wp99234' ),
+                            'type' => 'password' ,
+                            'id' => 'password' ,
+                            'default' => '',
+                            'attributes' => array('required' => true, 'class' => 'wp99234-input_field_text')
+                        ),
+                        'conf_pass' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Confirm Password', 'wp99234' ),
+                            'type' => 'password' ,
+                            'id' => 'confirm_password' ,
+                            'default' => '',
+                            'attributes' => array('required' => true, 'class' => 'wp99234-input_field_password')
+                        )
+                        );
+                        foreach( $pass_fields as $key => $pass_field ){
+                        WP99234()->_registration->display_field( $key, $pass_field );
+                        }
+                        echo '</div>';
+                    }
+                    ?>
+                </div>
+            </div>
+            <div class="wp99234-section cc_details">
+                <h4 class="wp99234-section_title"><?php _e( 'Payment Details', 'wp99234' ); ?></h4>
+                <div class="wp99234-section_content">
+                    <?php
+                    $cc_fields = array(
+                        'cc_name' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Cardholder Name', 'wp99234' ),
+                            'default' => '',
+                            'attributes' => array('required' => true, 'autocomplete' => 'cc-name')
+                        ),
+                        'cc_number' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Card Number', 'wp99234' ),
+                            'default' =>'',
+                            'attributes' => array(
+                            'required' => true,
+                            'class' => 'woocommerce-Input input-text',
+                            'placeholder' => "•••• •••• •••• ••••",
+                            'maxlength' => 19,
+                            'type'=> 'tel',
+                            'inputmode'=> 'numeric',
+                            'autocomplete' => 'cc-number'
+                            )
+                        ),
+                        'cc_exp' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Expiry Date', 'wp99234' ),
+                            'default' => '' ,
+                            'attributes' => array(
+                                'placeholder' => 'MM / YYYY',
+                                'required' => true,
+                                'autocomplete' => 'cc-exp'
+                            ),
+                        ),
+                        'cc_cvv' => array(
+                            (get_option('wp99234_club_use_placeholders') == 'yes' ? 'placeholder' : 'label') => __( 'Card code', 'wp99234' ),
+                            'default' => '' ,
+                            'attributes' => array(
+                                'placeholder' => 'CVC',
+                                'required' => true,
+                                'autocomplete' => 'cc-cvv'
+                            ),
+                        )
+                    );
+                    $has_cc_details = false;
+                    if( is_user_logged_in() ){
+                        $has_cc_meta = get_user_meta( get_current_user_id(), 'has_subs_cc_data', true );
+                        if( $has_cc_meta && $has_cc_meta == true ){
+                            $has_cc_details = true;
+                        }
+                    }
+                    if( $has_cc_details ){
+                        echo '<div><input type="checkbox" id="wp99234_use_existing_card" name="wp99234_use_existing_card" checked="checked" value="yes" style="width:auto;display:inline-block;"/> ' . sprintf( '<label for="wp99234_use_existing_card" style="width:auto;display:inline-block;vertical-align:middle;margin-bottom:0;margin-left:5px;">Use existing card (%s)</label></div>', get_user_meta( get_current_user_id(), 'cc_number', true ) );
+                        echo '<div id="hidden_cc_form"><br /><p>' . __( 'Card details entered here will be stored securely for future use.', 'wp99234' ) . '</p>';
+                    }
+                    foreach( $cc_fields as $key => $cc_field ){
+                        $css_class = null;
+                        if ($key === 'cc_exp') $css_class = 'form-row-first woocommerce-validated';
+                        if ($key === 'cc_cvv') $css_class = 'form-row-last woocommerce-validated';
+                        WP99234()->_registration->display_field( $key, $cc_field, $css_class );
+                    }
+                    if( $has_cc_details ){
+                        echo '</div>';
+                    }
+                    ?>
+                </div>
+            </div>
+            <?php
+            do_action('wp99234_preferences_form');
+            ?>
+        </div>
+        <p class="form-submit form-row">
+        <label id='message'></label>
+        <input type="hidden" name="<?php echo WP99234()->_registration->nonce_name; ?>" value="<?php echo wp_create_nonce( WP99234()->_registration->nonce_action ); ?>" />
+        <input class="button" type="submit" name="<?php echo WP99234()->_registration->submit_name; ?>" value="<?php _e( 'Sign Up Now', 'wp99234' ); ?>" id="wp99234_member_submit" />
+        </p>
+    </form>
+</div>
 <?php
 $limit = (int)(get_option('wp99234_legal_drinking_age'));
 …
 ?>
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         $("#subs_birthday").datepicker({
             maxDate: '-<?php echo $limit; ?>',
             changeYear: true,
             changeMonth: true,
             minDate: '-105y',
+    jQuery(document).ready(function($) {
+        $("#subs_birthday").datepicker({
+            maxDate: '-<?php echo $limit; ?>',
+            changeYear: true,
+            changeMonth: true,
+            minDate: '-105y',
             yearRange: '<?php echo ($year - 105) . ':' . ($year - $limit); ?>',
             defaultDate: '<?php echo date('F') . ' ' . date('d') . ', ' . ($year - $limit); ?>',
         });
         $('#wp99234_member_registration_form .tags .tag').click(function(e) {
             e.preventDefault();
             if ($(this).hasClass('tag-selected')) {
                 $(this).removeClass('tag-selected');
             } else {
                 $(this).addClass('tag-selected');
+            }
             var tag_ids = [];
             $('#wp99234_member_registration_form .tag').each(function(i, row) {
                 if ($(row).hasClass('tag-selected')) {
                     tag_ids.push($(row).attr('customer-tag'));
+                }
             });
             $('#tag_ids').val(tag_ids);
+        $('#wp99234_member_registration_form .tags .tag').click(function(e) {
+            e.preventDefault();
+            if ($(this).hasClass('tag-selected')) {
+                $(this).removeClass('tag-selected');
+            } else {
+                $(this).addClass('tag-selected');
+            }
+            var tag_ids = [];
+            $('#wp99234_member_registration_form .tag').each(function(i, row) {
+                if ($(row).hasClass('tag-selected')) {
+                    tag_ids.push($(row).attr('customer-tag'));
+                }
+            });
+            $('#tag_ids').val(tag_ids);
         });
 …
         $('input[name=cc_number]').on( 'blur', function(){
             if( ! jQuery.payment.validateCardNumber( $( this ).val() ) ){
+            if( ! jQuery.payment.validateCardNumber( $( this ).val() ) ){
                 $( this ).addClass( 'invalid' )
             } else {
+            } else {
                 $( this ).removeClass( 'invalid' )
+            }
+        });
+            }
+        });
+        $( '#troly_shipping_country' ).selectWoo({
+            width: '100%',
+            height: '350px'
+        })
     });
 </script>

subscribility/trunk/readme.txt

-                      r2333978
+                      r2370819
 Requires at least: 4.9.0
 Tested up to: 5.4.2
 Stable Tag: 2.9.19.4
+Stable Tag: 2.9.19.5
 PHP version: 7.0 and above
 License: GPLv2 or later
 …
 ## Changelog
+###Version 2.9.19.5
+- Bug fixed with payment processing with external payment gateways.
+- Improved plugin stability and other bugs fixed.
 ###Version 2.9.19.4
 - Added plugin action links for Settings and plugin documentation.

subscribility/trunk/wp99234.php

-                      r2333978
+                      r2370819
  * Plugin URI: https://wordpress.org/plugins/subscribility/
  * Description: Manage and fulfil your sales of wine, beers and other crafted beverages, through clubs and other direct-to-consumer sales channels.
  * Version: 2.9.19.4
+ * Version: 2.9.19.5
  * Author: Troly
  * Author URI: https://troly.io
 …
         include_once( 'includes/frontend/controllers/class-wp99234-template.php' );
         include_once( 'includes/frontend/controllers/class-wp99234-themes-footer.php' );
         include_once( 'includes/frontend/controllers/class-wp99234-customer-controller.php' );
         include_once( 'includes/frontend/controllers/class-wp99234-order-controller.php' );

Note: See TracChangeset for help on using the changeset viewer.

Trac UI Preferences

Plugin Directory