Changeset 2689611

Timestamp:

03/06/2022 03:58:13 PM (4 years ago)

Author:

timotheemoulin

Message:

0.2.0

• Allow selecting multiple products with different quantities
• Allow selecting product variations

Location:

wc-cart-automation/trunk

Files:

• README.md (added)
• README.txt (deleted)
• css/admin.css (modified) (1 diff)
• css/admin.css.map (modified) (1 diff)
• includes/class-cpt-automation.php (modified) (8 diffs)
• includes/class-wcca-admin.php (modified) (10 diffs)
• includes/class-wcca.php (modified) (5 diffs)
• js (added)
• js/wcca_admin.js (added)
• wc-cart-automation.php (modified) (1 diff)

wc-cart-automation/trunk/css/admin.css

@@ -1 @@
-body.post-type-wcca .wcca-field{display:flex;align-items:start;margin:1rem 0}body.post-type-wcca .wcca-field .wcca-label{font-weight:bold;flex-basis:30%}body.post-type-wcca .wcca-field .wcca-input{flex-grow:1}body.post-type-wcca .wcca-field .wcca-input>*{width:100%}body.post-type-wcca .wcca-field .wcca-input-checkbox,body.post-type-wcca .wcca-field .wcca-input-radio{display:block;overflow:auto;padding:.5em 0}body.post-type-wcca .wcca-field .wcca-input-checkbox>label,body.post-type-wcca .wcca-field .wcca-input-radio>label{display:block}body.post-type-wcca .wcca-field .wcca-input-checkbox>label+label,body.post-type-wcca .wcca-field .wcca-input-radio>label+label{margin-top:.5em}body.post-type-wcca .wcca-field .wcca-input-textarea{flex-basis:100%;flex-shrink:0}body.post-type-wcca p.warning{padding:.5em;color:#c00;background-color:#ffe6e6}/*# sourceMappingURL=admin.css.map */
+body.post-type-wcca .wcca-field {
+  display: flex;
+  align-items: start;
+  margin: 1rem 0;
+}
+body.post-type-wcca .wcca-field .wcca-label {
+  font-weight: bold;
+  flex-basis: 30%;
+}
+body.post-type-wcca .wcca-field .wcca-input {
+  flex-grow: 1;
+}
+body.post-type-wcca .wcca-field .wcca-input > * {
+  width: 100%;
+}
+body.post-type-wcca .wcca-field .wcca-input-checkbox, body.post-type-wcca .wcca-field .wcca-input-radio {
+  display: block;
+  overflow: auto;
+  padding: 0.5em 0;
+}
+body.post-type-wcca .wcca-field .wcca-input-checkbox > label, body.post-type-wcca .wcca-field .wcca-input-radio > label {
+  display: block;
+}
+body.post-type-wcca .wcca-field .wcca-input-checkbox > label + label, body.post-type-wcca .wcca-field .wcca-input-radio > label + label {
+  margin-top: 0.5em;
+}
+body.post-type-wcca .wcca-field .wcca-input-textarea {
+  flex-basis: 100%;
+  flex-shrink: 0;
+}
+body.post-type-wcca p.warning {
+  padding: 0.5em;
+  color: #cc0000;
+  background-color: #ffe6e6;
+}
+
+/*# sourceMappingURL=admin.css.map */

wc-cart-automation/trunk/css/admin.css.map

@@ -1 @@
-{"version":3,"sourceRoot":"","sources":["admin.scss"],"names":[],"mappings":"AACC,gCACC,aACA,kBACA,cAEA,4CACC,iBACA,eAGD,4CACC,YAEA,8CACC,WAGD,uGACC,cACA,cACA,eAEA,mHACC,cAEA,+HACC,gBAKH,qDACC,gBACA,cAKH,8BACC,aACA,WACA","file":"admin.css"}
+{"version":3,"sourceRoot":"","sources":["admin.scss"],"names":[],"mappings":"AACC;EACC;EACA;EACA;;AAEA;EACC;EACA;;AAGD;EACC;;AAEA;EACC;;AAGD;EACC;EACA;EACA;;AAEA;EACC;;AAEA;EACC;;AAKH;EACC;EACA;;AAKH;EACC;EACA;EACA","file":"admin.css"}

wc-cart-automation/trunk/includes/class-cpt-automation.php

@@ -49 +49 @@
         ] );
 
-        static::add_field( 'products', __( 'Products to add', WCCA_PLUGIN_NAME ), 'select2', [
-            'post_type' => 'product',
-            'single'    => false,
+        static::add_field( 'products', __( 'Products to add', WCCA_PLUGIN_NAME ), 'repeater', [
+            'sub_fields' => [
+                [
+                    'option' => 'quantity',
+                    'label'  => __( 'Quantity', WCCA_PLUGIN_NAME ),
+                    'type'   => 'number',
+                ],
+                [
+                    'option' => 'product',
+                    'label'  => __( 'Product', WCCA_PLUGIN_NAME ),
+                    'type'   => 'select2',
+                    'args'   => [
+                        'post_type' => 'product',
+                        'single'    => true,
+                    ],
+                ],
+            ],
         ] );
 
@@ -64 +78 @@
      * @param string $label
      * @param string $type
-     * @param array  $args
+     * @param array $args
      */
     private static function add_field( string $option, string $label, string $type = 'text', array $args = [] ): void {
@@ -98 +112 @@
             // ensure that the cart is loaded
             WC()->cart->get_cart();
-            foreach ( $cart[ 'content' ] as $product ) {
+            foreach ( $cart['content'] as $product ) {
                 WC()->cart->add_to_cart( $product );
             }
 
-            foreach ( $cart[ 'coupons' ] as $coupon ) {
+            foreach ( $cart['coupons'] as $coupon ) {
                 if ( $the_coupon = new WC_Coupon( $coupon ) ) {
                     WC()->cart->apply_coupon( $the_coupon->get_code() );
@@ -116 +130 @@
      */
     public static function woocommerce_init(): void {
-        if ( ! ( $wcca = $_REQUEST[ 'wcca' ] ?? null ) ) {
+        if ( ! ( $wcca = $_REQUEST['wcca'] ?? null ) ) {
             // bail early if there is no wcca code in the URL
             return;
@@ -168 +182 @@
             $wcca_ID = $wcca_ID->ID;
         }
-
-        $wcca = get_post_meta( $wcca_ID );
 
         // ensure that the cart is loaded
@@ -192 +204 @@
         wcca()->add_customer_wcca_opening( $wcca_ID );
 
-        foreach ( $wcca[ 'wcca_products' ] as $product ) {
-            WC()->cart->add_to_cart( $product );
-        }
-
-        foreach ( $wcca[ 'wcca_coupons' ] as $coupon ) {
+        foreach ( get_post_meta( $wcca_ID, 'wcca_products', true ) as $product ) {
+            if ( is_scalar( $product ) ) {
+                // store only the product with quantity 1 (early version of the plugin)
+                WC()->cart->add_to_cart( $product );
+            } else {
+                $wc_product = wc_get_product( $product['product'] );
+                if ( $wc_product->is_type( 'simple' ) ) {
+                    WC()->cart->add_to_cart( $wc_product->get_id(), $product['quantity'] ?? 1 );
+                } elseif ( $wc_product->is_type( 'variation' ) ) {
+                    WC()->cart->add_to_cart( $wc_product->get_parent_id(), $product['quantity'] ?? 1, $wc_product->get_id() );
+                }
+            }
+        }
+
+        foreach ( get_post_meta( $wcca_ID, 'wcca_coupons' ) as $coupon ) {
             if ( $the_coupon = new WC_Coupon( $coupon ) ) {
                 WC()->cart->apply_coupon( $the_coupon->get_code() );
@@ -218 +240 @@
     public static function save_post( int $wcca_ID ): void {
         foreach ( static::$fields as $field => $data ) {
-            if ( $data[ 'args' ][ 'single' ] ?? true ) {
+            if ( ! empty( $data['args']['sub_fields'] ?? [] ) ) {
+                /*$sub_fields = [];
+                foreach ( $_REQUEST[ 'wcca_' . $field ] ?? [] as $row_index => $row_values ) {
+                    foreach ( $data['args']['sub_fields'] as $key => $sub_field ) {
+                        $a = 0;
+                    }
+                }*/
+                // store all the repeater values in the same repeater meta
+                $sanitized_values = [];
+                foreach ( $_REQUEST[ 'wcca_' . $field ] ?? [] as $row_id => $row ) {
+                    if ( $row_id < 0 ) {
+                        continue;
+                    }
+                    foreach ( $row as $key => $value ) {
+                        if ( is_array( $value ) ) {
+                            $row[ $key ] = array_map( 'sanitize_text_field', $value );
+                        } else {
+                            $row[ $key ] = sanitize_text_field( $value );
+                        }
+                    }
+                    $sanitized_values[] = $row;
+                }
+
+                update_post_meta( $wcca_ID, 'wcca_' . $field, $sanitized_values );
+            } elseif ( $data['args']['single'] ?? true ) {
                 update_post_meta( $wcca_ID, 'wcca_' . $field, sanitize_text_field( $_REQUEST[ 'wcca_' . $field ] ?? null ) );
             } else {
@@ -274 +320 @@
     public static function render_meta_box_fields() {
         foreach ( static::$fields as $field ) {
-            WCCA_Admin::the_custom_field_admin( $field[ 'name' ], $field[ 'label' ], $field[ 'type' ], $field[ 'args' ] );
+            WCCA_Admin::the_custom_field_admin( $field['name'], $field['label'], $field['type'], $field['args'] );
         }
     }

wc-cart-automation/trunk/includes/class-wcca-admin.php

@@ -4 +4 @@
 
 use Exception;
+use WP_Post;
 use WP_Query;
 
@@ -30 +31 @@
             $count = count( $openings, COUNT_RECURSIVE );
             printf( _x( '<span title="all %s">a : %s</span>', 'all', WCCA_PLUGIN_NAME ), $count, $count );
-        } else if ( 'orders' === $column ) {
+        } elseif ( 'orders' === $column ) {
             $orders = get_option( 'wcca_orders_' . $post_id, [] );
             echo count( $orders );
@@ -37 +38 @@
 
     public static function manage_wcca_posts_columns( array $columns ): array {
-        $columns[ 'openings' ] = __( 'Openings', WCCA_PLUGIN_NAME );
-        $columns[ 'orders' ]   = __( 'Orders', WCCA_PLUGIN_NAME );
+        $columns['openings'] = __( 'Openings', WCCA_PLUGIN_NAME );
+        $columns['orders']   = __( 'Orders', WCCA_PLUGIN_NAME );
 
         return $columns;
     }
-
 
     /**
@@ -72 +72 @@
 
         $stati = get_post_stati();
-        unset( $stati[ 'auto-draft' ], $stati[ 'revision' ], $stati[ 'publish' ] );
+        unset( $stati['auto-draft'], $stati['revision'], $stati['publish'] );
         $inactive = ( new WP_Query( [ 'post_type' => 'wcca', 'post_status' => $stati ] ) )->post_count;
 
@@ -84 +84 @@
      * @param string $label
      * @param string $type
-     * @param array  $args
+     * @param array $args
      *
      * @throws Exception
      */
     public static function the_custom_field_admin( string $option, string $label, string $type = 'text', array $args = [] ): void {
-        $required = $args[ 'required' ] ?? false;
+        $required      = $args['required'] ?? false;
+        $single        = $args['single'] ?? true;
+        $default_value = $args['default_value'] ?? $_REQUEST[ 'wcca_' . $option ] ?? get_post_meta( get_the_ID(), 'wcca_' . $option, $single ) ?: null;
 
         switch ( $type ) {
+            case 'repeater':
+                // register the repeater JS
+                wp_enqueue_script( WCCA_PLUGIN_NAME . '-admin', plugin_dir_url( WCCA_PLUGIN_FILE ) . '/js/wcca_admin.js' );
+
+                // get the repeated values
+                $repeater_values = get_post_meta( get_the_ID(), 'wcca_' . $option, true );
+                $repeater_count  = count( $repeater_values ) ?: 1;
+                ob_start();
+                // create every repeater row
+                for ( $repeater_key = - 1; $repeater_key < $repeater_count; $repeater_key ++ ) {
+                    printf( '<div class="repeater-row" style="display:%s;">', $repeater_key === - 1 ? 'none' : 'block' );
+                    foreach ( $args['sub_fields'] as $sub_field ) {
+                        $sub_field['args']                  = $sub_field['args'] ?? [];
+                        $sub_field['args']['default_value'] = $repeater_values[ $repeater_key ][ $sub_field['option'] ] ?? null;
+                        WCCA_Admin::the_custom_field_admin( $option . '[' . $repeater_key . ']' . '[' . $sub_field['option'] . ']', $sub_field['label'], $sub_field['type'], $sub_field['args'] );
+                    }
+                    printf( '<a href="#" class="delete_current_row">%s</a>', __( 'Delete', WCCA_PLUGIN_NAME ) );
+                    echo '<hr>';
+                    echo '</div>';
+                }
+
+                // insert the "add row" button
+                printf( '<a href="#" class="add_row">%s</a>', __( 'Add', WCCA_PLUGIN_NAME ) );
+
+                $html = ob_get_clean();
+
+                break;
             case 'text':
             case 'url':
@@ -97 +126 @@
             case 'email':
             case 'number':
-                $default_value = $_REQUEST[ 'wcca_' . $option ] ?? get_post_meta( get_the_ID(), 'wcca_' . $option, true ) ?: null;
                 $default_value = esc_attr( $default_value );
 
@@ -110 +138 @@
                 break;
             case 'textarea':
-                $default_value = $_REQUEST[ 'wcca_' . $option ] ?? get_post_meta( get_the_ID(), 'wcca_' . $option, true ) ?: null;
                 $default_value = esc_attr( $default_value );
 
@@ -119 +146 @@
             case 'select':
             case 'select2':
-                $single        = $args[ 'single' ] ?? true;
-                $default_value = $_REQUEST[ 'wcca_' . $option ] ?? get_post_meta( get_the_ID(), 'wcca_' . $option, $single );
-                $default_value = esc_attr( $default_value );
-
-                if ( $post_type = $args[ 'post_type' ] ?? null ) {
+                if ( is_array( $default_value ) ) {
+                    $default_value = array_map( 'esc_attr', $default_value );
+                } else {
+                    $default_value = esc_attr( $default_value );
+                }
+
+                $opt_groups = [];
+
+                if ( $post_type = $args['post_type'] ?? null ) {
                     $query   = new WP_Query( [
                         'post_type'           => $post_type,
-                        'limit'               => - 1,
+                        'posts_per_page'      => - 1,
                         'post_status__not_in' => [ 'trash' ],
+                        'order'               => 'ASC',
+                        'orderby'             => 'title',
                     ] );
                     $choices = [];
-                    foreach ( $query->posts as $product ) {
-                        $choices[ $product->ID ] = $product->post_title;
+
+                    foreach ( $query->posts as $post ) {
+                        if ( 'product' === $post->post_type ) {
+                            $wc_product = wc_get_product( $post );
+                            if ( $wc_product->is_type( 'simple' ) ) {
+                                $choices[ $wc_product->get_id() ] = $wc_product->get_title();
+                            } elseif ( $wc_product->is_type( 'variable' ) ) {
+                                $choices[ $wc_product->get_id() ] = $wc_product->get_name();
+
+                                foreach ( $wc_product->get_available_variations() as $variation ) {
+                                    $variation                          = wc_get_product( $variation['variation_id'] );
+                                    $opt_groups[ $variation->get_id() ] = $wc_product->get_id();
+                                    $choices[ $variation->get_id() ]    = $variation->get_name();
+                                }
+                            }
+                        } elseif ( $post instanceof WP_Post ) {
+                            $choices[ $post->ID ] = $post->post_title;
+                        }
                     }
                 } else {
-                    $choices = $args[ 'choices' ] ?? [];
+                    $choices = $args['choices'] ?? [];
                 }
 
@@ -167 +216 @@
                         $single ? '' : '[]',
                         $option,
-                        ( $args[ 'required' ] ?? false ) ? 'required' : '',
+                        ( $args['required'] ?? false ) ? 'required' : '',
                         $single ? '' : 'multiple'
                     );
@@ -177 +226 @@
                     foreach ( $choices as $key => $value ) {
                         $selected = in_array( $key, (array) $default_value );
-                        $html     .= sprintf(
-                            '<option value="%s" %s>%s</option>',
-                            $key,
-                            ( $selected ? 'selected' : '' ),
-                            $value
-                        );
+                        if ( in_array( $key, $opt_groups ) ) {
+                            // open the option group
+                            $html .= sprintf(
+                                '<optgroup label="%s">',
+                                $value,
+                            );
+                        } else {
+                            // close the option group if the current option is not in a group
+                            if ( ! array_key_exists( $key, $opt_groups ) ) {
+                                $html .= '</optgroup>';
+                            }
+
+                            $html .= sprintf(
+                                '<option value="%s" %s>%s</option>',
+                                $key,
+                                ( $selected ? 'selected' : '' ),
+                                $value
+                            );
+                        }
                     }
 

wc-cart-automation/trunk/includes/class-wcca.php

@@ -72 +72 @@
     public function add_customer_wcca_opening( ?int $wcca_ID = null ) {
         if ( empty( $wcca_ID ) ) {
-            if ( empty( $wcca_ID = ( $_COOKIE[ 'wcca' ] ?? null ) ) ) {
+            if ( empty( $wcca_ID = ( $_COOKIE['wcca'] ?? null ) ) ) {
                 // something wrong happened and the trace of the user has been lost
                 return;
@@ -79 +79 @@
 
         $openings = get_option( 'wcca_openings_' . $wcca_ID, [] );
-        if ( empty( $current_user = WC()->session->get_customer_unique_id() ) ) {
+
+        if ( method_exists( WC()->session, 'get_customer_unique_id' ) ) {
+            $current_user = WC()->session->get_customer_unique_id();
+        } else {
+            $current_user = WC()->session->get_customer_id();
+        }
+
+        if ( empty( $current_user ) ) {
             // we should not get here, but just in case, consider that is some anonymous visitor
             $current_user = 0;
@@ -88 +95 @@
 
         setcookie( 'wcca', $wcca_ID );
-        $_COOKIE[ 'wcca' ] = $wcca_ID;
+        $_COOKIE['wcca'] = $wcca_ID;
 
         update_option( 'wcca_openings_' . $wcca_ID, $openings );
@@ -97 +104 @@
      *
      * @param WC_Order|null $order
-     * @param ?int          $wcca_ID
+     * @param ?int $wcca_ID
      */
     public function add_order_to_wcca( WC_Order $order = null, ?int $wcca_ID = null ) {
         if ( empty( $wcca_ID ) ) {
-            if ( empty( $wcca_ID = ( $_COOKIE[ 'wcca' ] ?? null ) ) ) {
+            if ( empty( $wcca_ID = ( $_COOKIE['wcca'] ?? null ) ) ) {
                 // something wrong happened and the trace of the user has been lost
                 return;
@@ -108 +115 @@
 
         setcookie( 'wcca', null );
-        $_COOKIE[ 'wcca' ] = null;
+        $_COOKIE['wcca'] = null;
 
         $orders = get_option( 'wcca_orders_' . $wcca_ID, [] );

wc-cart-automation/trunk/wc-cart-automation.php

@@ -8 +8 @@
  * Text Domain:     wc-cart-automation
  * Domain Path:     /languages
- * Version:         0.1.2
+ * Version:         0.2.0
  *
  * @package         Wc_Promo_Cart