Changeset 3047333

Timestamp:

03/07/2024 04:43:55 PM (2 years ago)

Author:

homescript

Message:

update to version 1.2

Location:

doko-box-builder/trunk

Files:

• README.txt (modified) (2 diffs)
• admin/class-hs-doko-admin.php (modified) (18 diffs)
• admin/css/hs-quilljs.css (modified) (1 diff)
• admin/js/hs-doko-admin.js (modified) (4 diffs)
• core/class-hs-doko-utils.php (modified) (1 diff)
• core/class-hs-doko.php (modified) (4 diffs)
• core/homescriptone-formulus.php (modified) (2 diffs)
• hs-doko.php (modified) (5 diffs)
• public/class-hs-doko-public.php (modified) (28 diffs)
• public/css/hs-doko-card.css (added)
• public/css/hs-doko-snackbar.css (added)
• public/js/hs-doko-public.js (modified) (12 diffs)
• public/js/hs-doko-rules.js (added)
• public/js/hs-doko-snackbar.js (added)
• public/js/hs-doko-utils.js (modified) (7 diffs)
• templates (added)
• templates/single-product (added)
• templates/single-product/doko-products.php (added)

doko-box-builder/trunk/README.txt

@@ -1 +1 @@
 === DokoBuilder : DIY Product Bundle for WooCommerce  ===
-Contributors: homescriptone, freemius
+Contributors: homescript, freemius
 Donate link: https://www.buymeacoffee.com/homescriptone
 Tags: woocommerce, product bundles, box-wrapping, gift, wrap, bundle, diy
 Requires at least: 4.4
 Tested up to: 6.4
-Stable tag: 1.1.2
+Stable tag: 1.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -60 +60 @@
 
 == Changelog ==
+<h4> 1.2 - 8 March 2024 <h4>
+<ul>
+    <li> Add ability to manage product stock </li>
+    <li> Add compatibility with WooCommerce 8.4 </li>
+</ul>
+
 <h4> 1.1.2 - 11 November 2023 <h4>
 <ul>

doko-box-builder/trunk/admin/class-hs-doko-admin.php

@@ -9 +9 @@
  * @package doko
  */
+namespace HS\Doko;
+
 /**
  * The admin-specific functionality of the plugin.
@@ -40 +42 @@
      * @return mixed|void
      */
-    private function get_default_cpt_args( $menu_icon = false )
+    private function get_default_cpt_args( $menu_icon = false, $args = array() )
     {
         /**
@@ -47 +49 @@
          * @since 1.0.0
          */
-        return apply_filters( 'doko_cpt_args', array(
+        $args = wp_parse_args( $args, apply_filters( 'doko_cpt_args', array(
             'hierarchical'        => false,
             'supports'            => array( 'title' ),
@@ -60 +62 @@
             'can_export'          => true,
             'menu_icon'           => $menu_icon,
-        ) );
+        ) ) );
+        return $args;
     }
     
@@ -101 +104 @@
          * class.
          */
-        global  $post_type ;
-        $list_cpts = array( 'doko-bundles' );
-        
-        if ( in_array( $post_type, $list_cpts, true ) || isset( $_GET['post_type'] ) && 'doko-bundles' === $_GET['post_type'] ) {
+        global  $post_type, $parent_file ;
+        $allowed_slugs = hs_dk_get_allowed_slug();
+        
+        if ( in_array( $post_type, $allowed_slugs['post_type'], true ) || in_array( $parent_file, $allowed_slugs['page'], true ) ) {
             wp_enqueue_style(
                 'select2',
@@ -156 +159 @@
          * class.
          */
-        global  $post_type, $post ;
-        $list_cpts = array( 'doko-bundles' );
-        
-        if ( in_array( $post_type, $list_cpts, true ) && is_object( $post ) || isset( $_GET['post_type'] ) && 'doko-bundles' === $_GET['post_type'] ) {
+        global  $post_type, $parent_file ;
+        $allowed_slugs = hs_dk_get_allowed_slug();
+        
+        if ( in_array( $post_type, $allowed_slugs['post_type'], true ) || in_array( $parent_file, $allowed_slugs['page'], true ) ) {
             wp_enqueue_script(
                 'hs-quilljs-js',
@@ -242 +245 @@
     public function add_menus()
     {
-        add_submenu_page(
-            null,
-            esc_html__( 'Manage Dynamic Rules', 'doko' ),
-            esc_html__( 'Manage Dynamic Rules', 'doko' ),
-            'manage_options',
-            'manage-dynamic-rules',
-            array( $this, 'get_conditional_rules_page' )
-        );
-        add_submenu_page(
-            'edit.php?post_type=doko-bundles',
-            esc_html__( 'Documentation', 'doko' ),
-            esc_html__( 'Documentation', 'doko' ),
-            'manage_options',
-            'doko-docs',
-            array( $this, 'redirect_to_docs' )
-        );
     }
     
@@ -403 +390 @@
             'normal'
         );
+        add_meta_box(
+            'doko-bundle-rules',
+            'Associate Rule to Bundle',
+            array( $this, 'get_associated_rule_to_bundle__premium_only' ),
+            'doko-bundles-rules',
+            'normal'
+        );
+        add_meta_box(
+            'doko-rules',
+            'Rules',
+            array( $this, 'get_rules__premium_only' ),
+            'doko-bundles-rules',
+            'normal'
+        );
+        do_action( 'doko_add_metaboxes' );
+    }
+    
+    public function get_dynamic_rules()
+    {
+        $posted_data = filter_input_array( INPUT_POST );
+        $bundle_id = $posted_data['bundle_id'];
+        $data_id = uniqid() . $bundle_id;
+        $args = $this->generate_content_args( $data_id );
+        $args['bundle_id'] = $bundle_id;
+        $args['current_index'] = $posted_data['current_index'];
+        $data = array(
+            'html' => $this->generate_rules_content( $data_id, $args ),
+            'args' => $args,
+        );
+        echo  wp_json_encode( $data ) ;
+        wp_die();
     }
     
@@ -481 +499 @@
         formulus_input_table( 'doko-box-settings', $table_args );
         ?>
-            <input type="hidden" name="doko_nonce" value="<?php 
+         <input type="hidden" name="doko_nonce" value="<?php 
         echo  esc_html( wp_create_nonce( 'doko_nonce' ) ) ;
         ?>" />
@@ -516 +534 @@
     }
     
+    public static function get_rules_data_to_unset()
+    {
+        return apply_filters( 'doko_data_rules_to_unset', array( 'rules' ) );
+    }
+    
     public static function get_data_to_unset()
     {
@@ -541 +564 @@
         ?>
                 <span class="product-data-wrapper type_box ">
-                    <button class="button button-primary" id="add-btn-off"><?php 
+                    <button class="button button-primary hs-add-screen" id="add-btn-off"><?php 
         esc_html_e( 'Add Screen ', 'doko' );
         ?></button>
-                    </ul>
                 </span>
                 <div class="woocommerce_variations wc-metaboxes">
@@ -568 +590 @@
         ?>" />
         <?php 
+    }
+    
+    private function generate_bundle_rule_fields( $args = array(), $saved_data = false )
+    {
+        $bundle_id = $args['bundle_id'];
+        /**
+         * Rule Bundle Data.
+         */
+        $pbundle_data = get_post_meta( $bundle_id, 'doko', true );
+        $bundle_data = $pbundle_data;
+        if ( isset( $args['parent_bundle_id'] ) ) {
+            /**
+             * Bundle Data.
+             */
+            $bundle_data = get_post_meta( $args['parent_bundle_id'], 'doko', true );
+        }
+        extract( $args );
+        $bundle_screens = array(
+            'first-step' => 'First step',
+        );
+        $first_step_mode = $bundle_data['box-selection-mode'] ?? "";
+        $box_products = $bundle_data['box-products'] ?? "";
+        $box_categories = $bundle_data['box-categories'] ?? "";
+        $first_step_options = array(
+            'mode'           => $first_step_mode,
+            'box-products'   => $box_products,
+            'box-categories' => $box_categories,
+        );
+        $fields_to_unset = self::get_data_to_unset();
+        foreach ( $fields_to_unset as $field ) {
+            if ( isset( $bundle_data[$field] ) ) {
+                unset( $bundle_data[$field] );
+            }
+        }
+        foreach ( $bundle_data as $bkey => $bvalue ) {
+            $bundle_screens[$bkey] = $bvalue['screen-name'];
+        }
+        $products = array(
+            'products' => array(),
+        );
+        $bundle_id = $args['parent_bundle_id'];
+        $table_args = apply_filters( 'doko_dynamic_rule_screen_table_fields', array(
+            'screen-name'          => array(
+            'label'       => esc_html__( 'Step Name :', 'doko' ),
+            'label_class' => 'doko-table-label',
+            'description' => esc_html__( 'Choose the step where you would like this rule to apply', 'doko' ),
+            'content'     => formulus_input_fields( "doko[{$select_id}][screen-name]", array(
+            'type'              => 'select',
+            'options'           => $bundle_screens,
+            'return'            => true,
+            'custom_attributes' => array(
+            'data-bundle-id' => $bundle_id,
+        ),
+            'class'             => array( 'doko-rule-step' ),
+        ), ( isset( $saved_data['screen-name'] ) ? $saved_data['screen-name'] : 'first-step' ) ) . '<span class="doko-bundle-screen-name-tip"></span>',
+        ),
+            'rules'                => array(
+            'label'       => esc_html__( 'Rules :', 'doko' ),
+            'label_class' => 'doko-table-label',
+            'description' => esc_html__( 'Choose the rule to associate to this step', 'doko' ),
+            'content'     => formulus_input_fields( "doko[{$select_id}][rule][]", array(
+            'type'              => 'select',
+            'options'           => $products['products'],
+            'return'            => true,
+            'custom_attributes' => array(
+            'multiple'       => true,
+            'data-bundle-id' => $bundle_id,
+        ),
+        ), ( isset( $saved_data['rule'] ) ? $saved_data['rule'] : 'all' ) ) . '<span class="doko-bundle-screen-name-tip"></span>',
+        ),
+            'actions'              => array(
+            'label'       => esc_html__( 'Action :', 'doko' ),
+            'label_class' => 'doko-table-label',
+            'description' => esc_html__( 'Choose the action to execute if this rule is triggered', 'doko' ),
+            'content'     => formulus_input_fields( "doko[{$select_id}][action]", array(
+            'type'              => 'select',
+            'options'           => array(
+            'limit-product-in-next-step'    => 'Limit product in next step',
+            'limit-product-in-current-step' => 'Limit product in current step',
+            'limit-amount-in-current-step'  => 'Limit amount in current step',
+            'limit-amount-in-next-step'     => 'Limit amount in next step',
+            'go-to-step'                    => 'Go to step',
+        ),
+            'return'            => true,
+            'custom_attributes' => array(
+            'data-bundle-id' => $bundle_id,
+        ),
+        ), ( isset( $saved_data['action'] ) ? $saved_data['action'] : 'limit-product-in-next-step' ) ) . '<span class="doko-bundle-screen-name-tip"></span>',
+        ),
+            'limit-product-number' => array(
+            'label'       => esc_html__( 'Limit product number for the action above :', 'doko' ),
+            'label_class' => 'doko-table-label',
+            'tr_class'    => "doko-limit-product-number doko-{$select_id}",
+            'description' => esc_html__( 'Define the product number limit in this step', 'doko' ),
+            'content'     => formulus_input_fields( "doko[{$select_id}][limit-product-number]", array(
+            'type'   => 'text',
+            'return' => true,
+        ), ( isset( $saved_data['limit-product-number'] ) ? $saved_data['limit-product-number'] : 1 ) ) . '<span class="doko-bundle-screen-name-tip"></span>',
+        ),
+            'limit-product-amount' => array(
+            'label'       => esc_html__( 'Limit product amount for the action above :', 'doko' ),
+            'label_class' => 'doko-table-label',
+            'tr_class'    => "doko-limit-product-amount doko-{$select_id}",
+            'description' => esc_html__( "Define the product amount limit in this step ( don't include currency in the field )", 'doko' ),
+            'content'     => formulus_input_fields( "doko[{$select_id}][limit-product-amount]", array(
+            'type'   => 'text',
+            'return' => true,
+        ), ( isset( $saved_data['limit-product-amount'] ) ? $saved_data['limit-product-amount'] : 10 ) ) . '<span class="doko-bundle-screen-name-tip"></span>',
+        ),
+            'step-to-go-to'        => array(
+            'label'       => esc_html__( 'Step to go :', 'doko' ),
+            'label_class' => 'doko-table-label',
+            'tr_class'    => "doko-go-to-screen doko-{$select_id}",
+            'description' => esc_html__( 'Choose the step you would like to redirect for this action', 'doko' ),
+            'content'     => formulus_input_fields( "doko[{$select_id}][step-to-go-to]", array(
+            'type'    => 'select',
+            'options' => $bundle_screens,
+            'return'  => true,
+        ), ( isset( $saved_data['step-to-go-to'] ) ? $saved_data['step-to-go-to'] : 'first-step' ) ) . '<span class="doko-bundle-screen-name-tip"></span>',
+        ),
+        ) );
+        return formulus_input_table( $section_name, $table_args, true );
     }
     
@@ -604 +748 @@
             'bundle-products' => esc_html__( 'Bundle Products', 'doko' ),
             'upgrade-cc'      => esc_html__( 'Bundle Cart Content (PRO Version)', 'doko' ),
+            'upgrade-card'    => esc_html__( 'Bundle Card Page (PRO Version)', 'doko' ),
         );
         /**
@@ -630 +775 @@
             'options' => apply_filters( 'doko_bundle_screen_disposition', $option_list ),
             'return'  => true,
-        ), ( isset( $saved_data['categories'] ) ? $saved_data['categories'] : 'bundle-products' ) ),
+        ), ( isset( $saved_data['screen-disposition'] ) ? $saved_data['screen-disposition'] : 'bundle-products' ) ),
         ),
             'display-bundle-title'             => array(
@@ -759 +904 @@
         $meta_key = 'doko';
         
-        if ( isset( $_POST[$meta_key], $_POST['doko_nonce'] ) && wp_verify_nonce( sanitize_key( $_POST['doko_nonce'] ), 'doko_nonce' ) ) {
-            $posted_data = filter_input(
-                INPUT_POST,
-                $meta_key,
-                FILTER_DEFAULT,
-                FILTER_REQUIRE_ARRAY
-            );
+        if ( isset( $_POST[$meta_key] ) ) {
+            $posted_data = filter_input_array( INPUT_POST );
+            $posted_data = $posted_data['doko'];
             update_post_meta( $post_id, $meta_key, $posted_data );
         }
@@ -828 +969 @@
         echo  wp_json_encode( $data ) ;
         wp_die();
+    }
+    
+    private function generate_rules_content( $data_id, $args, $saved_data = false )
+    {
+        $screen_name = "Rule #" . $args['current_index'];
+        $args['screen-name'] = $data_id;
+        $content = $this->generate_bundle_rule_fields( $args, $saved_data );
+        $variation_id = $data_id;
+        ob_start();
+        ?>
+        <div class="woocommerce_variation wc-metabox variation-needs-update doko-dynamic-bundle closed" style="border-radius: 3px; background: #fff; border: 1px solid black; margin: 0 !important;">
+            <h3 class="doko-collapse">
+                <a href="#" class="remove_variation delete" style="float: right;" rel="<?php 
+        echo  esc_attr( $variation_id ) ;
+        ?>"><?php 
+        esc_html_e( 'Remove', 'doko' );
+        ?></a>
+                <div class="handlediv" style="width: 27px; float: right;" aria-label="<?php 
+        esc_attr_e( 'Click to toggle', 'doko' );
+        ?>"></div>
+                <strong><span class="doko-section-<?php 
+        echo  esc_attr( $data_id ) ;
+        ?>"> <?php 
+        echo  wp_kses_post( $screen_name ) ;
+        ?>  </span></strong>
+
+                <input type="hidden" class="variable_post_id"  />
+                <input type="hidden" class="variation_menu_order"  />
+            </h3>
+            <div class="woocommerce_variable_attributes wc-metabox-content" style="display: none;">
+                <div class="data">
+                    <?php 
+        formulus_format_fields( $content );
+        ?>
+                </div>
+            </div>
+        </div>
+        <?php 
+        return ob_get_clean();
     }
     
@@ -870 +1050 @@
     public function get_columns_values( $column_name, $id )
     {
-        
         if ( 'bundle_shortcodes' === $column_name ) {
             formulus_format_fields( $this->generate_bundle_shortcode( $id ) );
-        } elseif ( 'bundle_rules' === $column_name ) {
-            $url = admin_url( "edit.php?post_type=doko-bundles&page=manage-dynamic-rules&bundle-id={$id}" );
-            formulus_format_fields( "<a class='button button-primary button-large ' href='{$url}'>" . esc_html__( 'Manage dynamic rules', 'doko' ) . '</a>' );
-        }
-        
+        }
         /**
          * Fires after the column value is generated.
@@ -1130 +1305 @@
         wp_die();
     }
+    
+    public function get_screen_products()
+    {
+        $posted_data = filter_input_array( INPUT_POST );
+        extract( $posted_data );
+        $data = $this->get_data( $bundle_id );
+        
+        if ( $screen == "first-step" ) {
+            $box_selection_mode = $data['box-selection-mode'];
+        } else {
+            $box_selection_mode = $data[$screen]['options'];
+        }
+        
+        $products = $this->get_screen_product_ids( $data, $box_selection_mode, $screen );
+        echo  wp_json_encode( $products ) ;
+        wp_die();
+    }
+    
+    private function get_screen_product_ids( $data, $mode, $screen_name = false )
+    {
+        $product_names = [
+            'no'  => '-- Do Nothing --',
+            'all' => 'If any product in step is added to box',
+        ];
+        $html = "<option value='no'>-- Do Nothing --</option>\n                     <option value='all'>If any product in step is added to box</option>\n                   ";
+        
+        if ( $screen_name == "first-step" ) {
+            
+            if ( $mode == "products" ) {
+                $all_products = $data['box-products'];
+                $products = doko_get_children_products( $all_products );
+            } else {
+                $args = array(
+                    'post_type'           => array( 'product', 'product_variation' ),
+                    'product_category_id' => $data['box-categories'],
+                    'return'              => 'ids',
+                    'limit'               => -1,
+                );
+                $all_products = wc_get_products( $args );
+                $products = doko_get_children_products( $all_products );
+            }
+        
+        } else {
+            
+            if ( $mode == "products" ) {
+                $all_products = $data[$screen_name]['products'];
+                $products = doko_get_children_products( $all_products );
+            } else {
+                $args = array(
+                    'post_type'           => array( 'product', 'product_variation' ),
+                    'product_category_id' => $data[$screen_name]['categories'],
+                    'return'              => 'ids',
+                    'limit'               => -1,
+                );
+                $all_products = wc_get_products( $args );
+                $products = doko_get_children_products( $all_products );
+            }
+        
+        }
+        
+        foreach ( $products as $product_id ) {
+            $product_names[$product_id] = "If product " . get_the_title( $product_id ) . " is added to box";
+            $html .= "<option value='{$product_id}'>If product " . get_the_title( $product_id ) . " is added to box</option>";
+        }
+        return array(
+            'products' => $product_names,
+            'html'     => $html,
+        );
+    }
 
 }

doko-box-builder/trunk/admin/css/hs-quilljs.css

@@ -378 +378 @@
     text-align: inherit;
   }
-  .ql-editor .ql-align-center {
+  .ql-editor .ql-align-center, .ql-align-center {
     text-align: center;
   }

doko-box-builder/trunk/admin/js/hs-doko-admin.js

@@ -98 +98 @@
             }
         });
-        $('#accordion div.group').map(function(i) { console.log($(this).children('.group1').data()); return this.id; }).get()
+        $('#accordion div.group').map(function(i) { return this.id; }).get()
     }
 
 
     $(document).ready(function(){
+        var hs_dk_bundle_screen = [
+            '#doko-bundle-screens',
+            '#doko-rules'
+        ];
+
+        for( var screen in hs_dk_bundle_screen ) {
+            $( '.type_box' ).insertAfter( hs_dk_bundle_screen[screen] + ' .hndle' );
+        }
+
+
+
+
+        var total_rule = 0;
+
+        $('button.hs-add-rule').on('click dbclick', function(e){
+            e.preventDefault();
+            var bundleId= $('select#doko-associated_rule-bundle').val();
+
+            if ( bundleId == "no" ) {
+                alert("Choose a bundle, before choosing a rule.");
+                return false;
+            }
+
+            $.blockUI({'message' : 'Preparing your bundle rule, please wait ....'});
+            $.post(ajaxurl, {'action': 'doko_get_bundle_rule', 'bundle_id' : bundleId , 'current_index' : total_rule },
+                function(r){
+                    r = JSON.parse(r);
+                    var idField = r.args.elem_id;
+                    $('div.woocommerce_variations').append( r.html );
+                    dk_init_sortable_event();
+                    dk_build_sortable_bundle( idField, r.args );
+
+                    hs_dk_get_screen_product_list( bundleId, idField );
+
+                    hs_dk_toggle_rule_action( bundleId, idField );
+                    total_rule ++;
+                    $.unblockUI();
+
+
+
+
+
+                } );
+        });
+
+
+
         if ( $('#doko-box-description').length > 0 ) {
 
@@ -133 +180 @@
             dk_change_option_disposition( 'input[name="doko[box-selection-mode]"]', 'tr.doko-box-products-mode', 'tr.doko-box-categories-mode');
 
-            $( '.type_box' ).insertAfter( '#doko-bundle-screens .hndle' );
-
-
-            $('button#add-btn-off').on('click dbclick', function(e){
+
+
+            $('button.hs-add-screen').on('click dbclick', function(e){
                 e.preventDefault();     
                 $.blockUI({'message' : 'Adding your bundle screen content, please wait ....'})
@@ -235 +281 @@
             }
         }
-        
+        var fields = window.doko_fields_list;
+        var bundleId = window.doko_bundle_id;
+        var js = JSON.parse(fields);
+
+
+        for( var id in js ) {
+            hs_dk_get_screen_product_list( bundleId, js[id] );
+            hs_dk_toggle_rule_action( bundleId, js[id] );
+        }
+
+
     });
 
@@ -396 +452 @@
     };
 
+    var hs_dk_toggle_rule_action = function( bundleId, idField ) {
+        var elem = $('select[name="doko['+idField+'][action]"][data-bundle-id="'+bundleId+'"]');
+
+        elem.on('change', function() {
+            var value = $(this).val();
+            if ( value == "limit-product-in-current-step"  || value == "limit-product-in-next-step"  ) {
+                $('tr.doko-limit-product-number.doko-'+idField ).show();
+                $('tr.doko-limit-product-amount.doko-'+idField ).hide();
+                $('tr.doko-go-to-screen.doko-'+idField ).hide();
+            }
+
+
+            if ( value == "limit-amount-in-current-step"  || value == "limit-amount-in-next-step"  ) {
+                $('tr.doko-limit-product-number.doko-'+idField ).hide();
+                $('tr.doko-limit-product-amount.doko-'+idField ).show();
+                $('tr.doko-go-to-screen.doko-'+idField ).hide();
+            }
+
+            if ( value == "go-to-step" ) {
+                $('tr.doko-limit-product-number.doko-'+idField ).hide();
+                $('tr.doko-limit-product-amount.doko-'+idField ).hide();
+
+                $('tr.doko-go-to-screen.doko-'+idField ).show();
+            }
+
+
+
+        });
+        elem.trigger('change');
+    }
+
+
+    var hs_dk_get_screen_product_list = function( bundleId, idField ) {
+        var elem = $('select[name="doko['+idField+'][screen-name]"][data-bundle-id="'+bundleId+'"]');
+
+
+
+        elem.on('change', function() {
+            var value = $(this).val();
+            $.post(
+                ajaxurl,
+                {
+                    bundle_id : bundleId,
+                    screen  : value,
+                    action : "doko_get_screen_products"
+                }, function(r) {
+                    var json = JSON.parse(r);
+
+                    if ( json.html ) {
+                        $('select[name="doko['+idField+'][rule][]"][data-bundle-id="'+bundleId+'"]').html(json.html);
+                        var jss = JSON.parse(window.doko_rule_list);
+                        if ( undefined != jss[idField] ) {
+                            var jrule = jss[idField]['rule'];
+                            $('select[name="doko[' + idField + '][rule][]"][data-bundle-id="' + bundleId + '"]').val(jrule);
+                            $('select[name="doko[' + idField + '][rule][]"][data-bundle-id="' + bundleId + '"]').select2({'width' : '100%' })
+                        }
+
+                    }
+
+                }
+            );
+        });
+        elem.trigger('change');
+    }
+
      
 })( jQuery );

doko-box-builder/trunk/core/class-hs-doko-utils.php

@@ -177 +177 @@
 }
 
+function hs_dk_get_products_query( $query ) {
+    $query['post_type'] = array( 'product', 'product_variation' );
+}
+
+
+function hs_dk_display_variations_as_single_product( $query ) {
+    $query->set( 'post_type', [ 'product', 'product_variation' ] );
+}
+
+add_action('pre_get_posts', function (){
+    add_action( 'woocommerce_product_query', 'hs_dk_display_variations_as_single_product');
+    add_filter( 'woocommerce_shortcode_products_query', 'hs_dk_get_products_query' , 999 );
+});
 
 if ( ! function_exists('hs_dk_display_products_from_categories' ) ) {
-    function hs_dk_display_products_from_categories( $product_categories ){
-        add_filter('woocommerce_product_related_products_heading', '__return_false' );
-
-        $wc_query = wc_get_products( array(
-            'post_type' => 'product',
-            'post_status'=>'public',
-            'tax_query' => array(
-                    array(
-                'taxonomy' => 'product_cat',
-                'field'    => 'ids',
-                'terms'    => $product_categories,
-                'operator' => 'IN',
+    function hs_dk_display_products_from_categories( $product_categories, $is_card_screen = false ){
+
+        $products = new WP_Query( array(
+            'post_type'   => 'product',
+            'post_status' => 'publish',
+            'fields'      => 'ids',
+            'tax_query'   => array(
+                'relation' => 'AND',
+                array(
+                    'taxonomy' => 'product_cat',
+                    'field'    => 'term_id',
+                    'terms'    => $product_categories,
                 )
             ),
-            'stock_status'  => 'instock'
+
         ) );
 
-
-        wc_get_template(
-            'single-product/related.php',
-            array(
-                'related_products' => $wc_query
+        $products = $products->posts;
+
+        echo do_shortcode( '[doko_products ids="' . implode( ',', $products ) . '"   columns="3" order="ASC" is_card_screen="'.$is_card_screen.'"]' );
+
+    }
+}
+
+if ( ! function_exists('hs_dk_get_allowed_slug') ) {
+    function hs_dk_get_allowed_slug() {
+        return apply_filters( 'doko_get_allowed_slugs', array(
+            'post_type' => array(
+                'doko-bundles',
+                'doko-bundles-rules',
+            ),
+            'page' => array(
+                'edit.php?post_type=doko-bundles&page=doko-settings'
             )
-        );
+        ));
     }
 }
 
+
+
+function doko_display_products( $atts ){
+    ob_start();
+
+    $atts = shortcode_atts(array(
+        'ids' => '',
+        'columns' => 3,
+        'order' => 'ASC',
+        'is_card_screen' => false
+    ), $atts );
+
+    wc_get_template(
+        'single-product/doko-products.php',
+        array(
+            'ids' => $atts['ids'],
+            'columns' => $atts['columns'],
+            'order_mode' => $atts['order'],
+            'is_card_screen' => $atts['is_card_screen']
+        )
+    );
+
+    return ob_get_clean();
+}
+
+
+function doko_get_children_products( $all_products ) {
+    $products = [];
+    foreach( $all_products as $pdtId ) {
+        $pdt = wc_get_product($pdtId);
+        $childrens = $pdt->get_children();
+        if ( count($childrens) > 0 ) {
+            $dpt = [];
+            foreach( $childrens as $pt ) {
+                if ( is_object( $pt ) ) {
+                    $dpt[] = $pt->get_id();
+                } else {
+                    $dpt[] = $pt;
+                }
+
+            }
+            $products = array_merge( $products, $dpt );
+        } else {
+            $products[] = $pdt->get_id();
+        }
+    }
+
+    return $products;
+}

doko-box-builder/trunk/core/class-hs-doko.php

@@ -159 +159 @@
     private function define_admin_hooks() {
 
-            $plugin_admin = new Hs_Doko_Admin( $this->get_plugin_name(), $this->get_version() );
+            $plugin_admin = new HS\Doko\Hs_Doko_Admin( $this->get_plugin_name(), $this->get_version() );
             $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
             $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
@@ -168 +168 @@
             $this->loader->add_action( 'wp_ajax_hs_dk_query_wc', $plugin_admin, 'query_wc' );
             $this->loader->add_action( 'save_post_doko-bundles', $plugin_admin, 'save_package' );
+            $this->loader->add_action( 'save_post_doko-bundles-rules', $plugin_admin, 'save_package' );
             $this->loader->add_filter( 'enter_title_here', $plugin_admin, 'change_cpt_title' );
-            $this->loader->add_filter( 'wp_ajax_doko_get_admin_screen', $plugin_admin, 'get_dynamic_contents' );
-            $this->loader->add_filter( 'wp_ajax_doko_get_dynamic_rules', $plugin_admin, 'generate_dynamic_rules' );
+            $this->loader->add_action( 'wp_ajax_doko_get_admin_screen', $plugin_admin, 'get_dynamic_contents' );
+            $this->loader->add_action( 'wp_ajax_doko_get_dynamic_rules', $plugin_admin, 'generate_dynamic_rules' );
             $this->loader->add_filter( 'manage_edit-doko-bundles_columns', $plugin_admin, 'get_columns' );
             $this->loader->add_action( 'manage_doko-bundles_posts_custom_column', $plugin_admin, 'get_columns_values', 5, 2 );
-            $this->loader->add_filter( 'wp_ajax_doko_save_dynamic_rules', $plugin_admin, 'save_dynamic_rules' );
-
-    }
+            $this->loader->add_action( 'wp_ajax_doko_save_dynamic_rules', $plugin_admin, 'save_dynamic_rules' );
+            $this->loader->add_action( 'wp_ajax_doko_get_bundle_rule', $plugin_admin, 'get_dynamic_rules' );
+            $this->loader->add_action( 'wp_ajax_doko_get_screen_products', $plugin_admin, 'get_screen_products' );
+
+
+
+    }
+
 
     /**
@@ -184 +190 @@
      */
     private function define_public_hooks() {
-        $plugin_public = new Hs_Doko_Public( $this->get_plugin_name(), $this->get_version() );
+        $plugin_public = new  HS\Doko\Hs_Doko_Public( $this->get_plugin_name(), $this->get_version() );
 
         $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
@@ -199 +205 @@
         $this->loader->add_action( 'woocommerce_before_calculate_totals', $plugin_public, 'set_box_total_price' );
         $this->loader->add_filter( 'woocommerce_loop_add_to_cart_link', $plugin_public, 'replace_default_btn_text', 9999 );
-        $this->loader->add_filter( 'woocommerce_shortcode_products_query_results', $plugin_public, 'display_variations_separately' );
         $this->loader->add_filter( 'woocommerce_loop_product_link', $plugin_public, 'disable_product_link', 9999 );
-        $this->loader->add_filter( 'woocommerce_shortcode_products_query', $plugin_public, 'hide_out_of_stock_products', 30, 3 );
-
     }
 

doko-box-builder/trunk/core/homescriptone-formulus.php

@@ -158 +158 @@
 
                     foreach ($args['options'] as $option_key => $option_text) {
+
+
                         $selected = '';
                         if ('' === $option_key) {
@@ -356 +358 @@
             'data-product-name'      => array(),
             'data-image-url'        => array(),
+            'data-bundle-id'         => array(),
+            'data-bundle-rule-id'         => array(),
+            'data-card-mode' => array()
 
 

doko-box-builder/trunk/hs-doko.php

@@ -2 +2 @@
 
 /**
- * The plugin bootstrap file
- *
- * This file is read by WordPress to generate the plugin information in the plugin
- * admin area. This file also core all of the dependencies used by the plugin,
- * registers the activation and deactivation functions, and defines a function
- * that starts the plugin.
  *
  * @link              https://ultiwp.com
@@ -17 +11 @@
  * Plugin URI:        https://ultiwp.com
  * Description:       Increase sales by letting your customers create custom bundles.
- * Version:           1.1.2
+ * Version:           1.2
  * Author:            UltiWP
  * Author URI:        https://ultiwp.com
@@ -24 +18 @@
  * Text Domain:       doko
  * Domain Path:       /languages
+ * Requires at least: 6.0
+ * Requires PHP: 7.4
+ * WC requires at least: 8.0.0
  */
 
@@ -36 +33 @@
  * Rename this for your plugin and update it as you release new versions.
  */
-define( 'DOKO_VERSION', '1.1.2' );
+define( 'DOKO_VERSION', '1.2' );
+
+add_action( 'before_woocommerce_init', function() {
+        if ( class_exists( \Automattic\WooCommerce\Utilities\FeaturesUtil::class ) ) {
+                    \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', __FILE__, true );
+        }
+});
 
 require plugin_dir_path( __FILE__ ) . 'core/premium-loading.php';
@@ -68 +71 @@
 
 
+add_filter( 'wc_get_template_part',             'doko_override_woocommerce_template_part', 10, 3 );
+// Override Template's.
+add_filter( 'woocommerce_locate_template',      'doko_override_woocommerce_template', 10, 3 );
+/**
+ * Template Part's
+ *
+ * @param  string $template Default template file path.
+ * @param  string $slug     Template file slug.
+ * @param  string $name     Template file name.
+ * @return string           Return the template part from plugin.
+ */
+function doko_override_woocommerce_template_part( $template, $slug, $name ) {
+    $template_directory = untrailingslashit( plugin_dir_path( __FILE__ ) ) . '/templates/';
+    if ( $name ) {
+        $path = $template_directory . "{$slug}-{$name}.php";
+    } else {
+        $path = $template_directory . "{$slug}.php";
+    }
+    return file_exists( $path ) ? $path : $template;
+}
+/**
+ * Template File
+ *
+ * @param  string $template      Default template file  path.
+ * @param  string $template_name Template file name.
+ * @param  string $template_path Template file directory file path.
+ * @return string                Return the template file from plugin.
+ */
+function doko_override_woocommerce_template( $template, $template_name, $template_path ) {
+    $template_directory = untrailingslashit( plugin_dir_path( __FILE__ ) ) . '/templates/';
+    $path = $template_directory . $template_name;
+    return file_exists( $path ) ? $path : $template;
+}
+
 
 /**

doko-box-builder/trunk/public/class-hs-doko-public.php

@@ -10 +10 @@
  * @subpackage Hs_Doko/public
  */
+namespace HS\Doko;
+
 /**
  * The public-facing functionality of the plugin.
@@ -101 +103 @@
             'all'
         );
+        wp_enqueue_style( 'jquery-ui' );
+        wp_enqueue_style(
+            'hs-quilljs-css',
+            plugin_dir_url( __FILE__ ) . '../admin/css/hs-quilljs.css',
+            array(),
+            $this->version,
+            'all'
+        );
+        wp_enqueue_style(
+            'hs-quilljs-bubble-css',
+            plugin_dir_url( __FILE__ ) . '../admin/css/hs-quilljs-bubble.css',
+            array(),
+            $this->version,
+            'all'
+        );
+        wp_enqueue_style(
+            'hs-doko-snackbar-css',
+            plugin_dir_url( __FILE__ ) . 'css/hs-doko-snackbar.css',
+            array(),
+            $this->version,
+            'all'
+        );
+        wp_enqueue_style(
+            'hs-doko-card-css',
+            plugin_dir_url( __FILE__ ) . 'css/hs-doko-card.css',
+            array(),
+            $this->version,
+            'all'
+        );
     }
     
@@ -131 +162 @@
             $this->plugin_name,
             plugin_dir_url( __FILE__ ) . 'js/hs-doko-public.js',
-            array( 'jquery', 'wp-hooks', $this->plugin_name . '-modal' ),
+            array( 'jquery', 'wp-hooks' ),
             $this->version,
             false
@@ -138 +169 @@
             $this->plugin_name . '-utils',
             plugin_dir_url( __FILE__ ) . 'js/hs-doko-utils.js',
-            array(
-            'jquery',
-            $this->plugin_name,
-            $this->plugin_name . '-modal',
-            'wp-hooks'
-        ),
+            array( 'jquery', $this->plugin_name, 'wp-hooks' ),
             $this->version,
             false
         );
         wp_enqueue_script(
-            $this->plugin_name,
+            $this->plugin_name . "-fa",
             plugin_dir_url( __FILE__ ) . 'js/fontawesome.min.js',
-            array( 'jquery', $this->plugin_name . '-modal' ),
+            array( 'jquery' ),
+            $this->version,
+            false
+        );
+        wp_enqueue_script(
+            'hs-doko-snackbar',
+            plugin_dir_url( __FILE__ ) . 'js/hs-doko-snackbar.js',
+            array( 'jquery' ),
             $this->version,
             false
@@ -161 +194 @@
          */
         $data = apply_filters( 'doko_js_data_boxpage', array(
-            'ajaxurl'           => admin_url( 'admin-ajax.php' ),
-            'wc_price_args'     => array(
+            'ajaxurl'              => admin_url( 'admin-ajax.php' ),
+            'wc_price_args'        => array(
             'html'                         => true,
             'currency_symbol'              => get_woocommerce_currency_symbol( get_woocommerce_currency() ),
@@ -171 +204 @@
             'price_format'                 => get_woocommerce_price_format(),
         ),
-            'next_message'      => esc_html__( 'Next', 'doko' ),
-            'loading_message'   => $loading_message,
-            'completed_message' => esc_html__( 'Your bundle is added to the cart, you will redirect to cart in few moments', 'doko' ),
-            'cart_page_url'     => wc_get_cart_url(),
+            'next_message'         => esc_html__( 'Next', 'doko' ),
+            'loading_message'      => $loading_message,
+            'completed_message'    => esc_html__( 'Your bundle is added to the cart, you will redirect to cart in few moments', 'doko' ),
+            'cart_page_url'        => wc_get_cart_url(),
+            'limit_product_number' => esc_html__( "You can't add more than %s products into the box." ),
+            'limit_product_amount' => esc_html__( "You reached the limit of %s for this box." ),
         ) );
         wp_add_inline_script( $this->plugin_name, ' var doko_object=' . wp_json_encode( $data ) . ';' );
+        wp_enqueue_script(
+            $this->plugin_name . '-rules',
+            plugin_dir_url( __FILE__ ) . 'js/hs-doko-rules.js',
+            array(
+            'jquery',
+            'wp-hooks',
+            $this->plugin_name,
+            $this->plugin_name . '-utils'
+        ),
+            $this->version,
+            false
+        );
     }
     
@@ -184 +231 @@
     public function init_shortcodes()
     {
+        global  $doko_is_card_page ;
+        $doko_is_card_page = false;
+        add_shortcode( 'doko_products', 'doko_display_products' );
         add_shortcode( 'doko-bundles', array( $this, 'display_shortcode' ) );
     }
     
     /**
+     * Retrieve all rules related to a bundle.
+     * @param $package_id string|integer Bundle Package Id
+     * @return array
+     */
+    private function get_rules_by_bundle( $package_id )
+    {
+        $query_args_meta = array(
+            'posts_per_page' => -1,
+            'post_type'      => 'doko-bundles-rules',
+            'post_status'    => 'publish',
+            'meta_query'     => array(
+            'relation' => 'AND',
+            array(
+            'key'     => 'doko',
+            'value'   => $package_id,
+            'compare' => 'LIKE',
+        ),
+        ),
+            'fields'         => 'ids',
+        );
+        $rules_ids = get_posts( $query_args_meta );
+        $rule_configs = array();
+        foreach ( $rules_ids as $rule_id ) {
+            $rule_configs[$rule_id] = get_post_meta( $rule_id, 'doko', true );
+        }
+        return $rule_configs;
+    }
+    
+    /**
      * Display the shortcode.
      *
@@ -196 +275 @@
     public function display_shortcode( $atts )
     {
+        global  $doko_is_card_page ;
         $package_id = ( isset( $atts['id'] ) ? $atts['id'] : false );
         $this->package_id = $package_id;
@@ -226 +306 @@
         <?php 
         $counter = 1;
+        $step_title = "";
+        if ( isset( $package_data['box-description'] ) ) {
+            $step_title = $package_data['box-description'];
+        }
         $fields_to_unset = Hs_Doko_Admin::get_data_to_unset();
         foreach ( $fields_to_unset as $field ) {
@@ -232 +316 @@
             }
         }
+        $step_identifier = array(
+            1 => 'first-step',
+        );
         ?>
         <div id="giftbox-progress-bar">
@@ -263 +350 @@
         $step_nb = 2;
         foreach ( $package_data as $key => $value ) {
+            $step_identifier[$step_nb] = $key;
             ?>
                             <div class="step" data-step-id="<?php 
@@ -322 +410 @@
                 <div class="hs-dk-box-selector hs-dk-bundle-page" id="doko-bundle-builder" data-page-id="<?php 
         echo  esc_attr( $counter ) ;
+        ?>" data-bundle-content-id="<?php 
+        echo  esc_attr( 'first-step' ) ;
         ?>">
                     <?php 
-        if ( isset( $package_data['box-description'] ) ) {
-            echo  wp_kses_post( $package_data['box-description'] ) ;
+        if ( !empty($step_title) ) {
+            echo  wp_kses_post( $step_title ) ;
         }
         ?>
@@ -332 +422 @@
         
         if ( 'products' === $box_selection_mode ) {
-            echo  do_shortcode( '[products ids="' . implode( ',', $box_data ) . '"  orderby="date" columns="3" order="ASC"]' ) ;
+            echo  do_shortcode( '[doko_products ids="' . implode( ',', $box_data ) . '"   columns="3" order="ASC"]' ) ;
         } elseif ( 'categories' === $box_selection_mode ) {
             hs_dk_display_products_from_categories( $box_data );
         }
         
+        $doko_is_card_page = false;
         ?>
                 </div>
+                <script>
+                    var doko_step_identifier = '<?php 
+        echo  json_encode( $step_identifier ) ;
+        ?>'
+                </script>
         <?php 
         foreach ( $package_data as $bundle_id => $bundle_data ) {
@@ -348 +444 @@
                 $sdisposition = $bundle_data['screen-disposition'];
                 $is_pro = false;
+                $doko_is_card_page = false;
                 if ( !$is_pro ) {
                     $sdisposition = 'bundle-products';
@@ -370 +467 @@
                     <?php 
                 } elseif ( 'bundle-cart-content' == $sdisposition ) {
+                } elseif ( 'bundle-card-page' == $sdisposition ) {
                 }
             
@@ -430 +528 @@
             'doko-box-container',
             'doko-box-contents',
+            'doko-card-page',
         ) );
         ?>
@@ -471 +570 @@
             <script>
                 doko_object.screens = <?php 
-        echo  wp_json_encode( array_keys( $package_data ) ) ;
+        $screens = array_keys( $package_data );
+        echo  wp_json_encode( array_merge( array( 'first-step' ), $screens ) ) ;
         ?>;
             </script>
@@ -500 +600 @@
             $data = $data['contents'];
             $container = $data['container'];
-            $contents = $data['contents'];
+            $card_details = array();
+            if ( isset( $data['card_details'] ) ) {
+                $card_details = $data['card_details'];
+            }
             $product_id = $container['product_id'];
             $quantity = $container['product_qty'];
-            $variation_id = $container['variation_id'];
             $product = wc_get_product( $product_id );
-            $variation_attr = $product->get_attributes();
-            if ( $variation_id === 0 ) {
+            
+            if ( isset( $container['variation_id'] ) && $container['variation_id'] != 0 ) {
+                $variation_id = $container['variation_id'];
+                $variation_attr = $product->get_default_attributes( 'edit' );
+            } else {
+                $variation_id = 0;
                 $variation_attr = array();
             }
+            
             $total_price = $product->get_price() * $quantity;
             $pdts = array();
-            if ( !empty($data['contents']) ) {
-                foreach ( $contents as $content ) {
-                    $total_price += $content['product_qty'] * $content['product_price'];
-                    if ( empty($content) ) {
-                        continue;
+            
+            if ( isset( $data['contents'] ) ) {
+                $contents = $data['contents'];
+                if ( isset( $data['contents']['card_details'] ) ) {
+                    unset( $data['contents']['card_details'] );
+                }
+                if ( !empty($data['contents']) ) {
+                    foreach ( $contents as $content ) {
+                        $total_price += $content['product_qty'] * $content['product_price'];
+                        if ( empty($content) ) {
+                            continue;
+                        }
+                        $pdts[] = $content;
                     }
-                    $pdts[] = $content;
                 }
             }
-            $dcontents = array(
+            
+            $dcontents = array();
+            $dcontents += array(
                 'box_contents' => $pdts,
                 'total_price'  => $total_price,
@@ -566 +682 @@
                 foreach ( $cart_item_key['box_contents'] as $screen_id => $screen_content ) {
                     $product_id = $screen_content['product_id'];
-                    $variation_id = $screen_content['variation_id'];
+                    $variation_id = 0;
+                    if ( isset( $screen_content['variation_id'] ) ) {
+                        $variation_id = $screen_content['variation_id'];
+                    }
                     $price = $screen_content['product_price'];
                     $qty = $screen_content['product_qty'];
@@ -588 +707 @@
                 
                 }
+                
+                if ( isset( $cart_item_key['card_details'] ) ) {
+                    $card_details = $cart_item_key['card_details'];
+                    $tproduct_name = "";
+                    if ( isset( $card_details['to'] ) && $card_details['to'] != "" ) {
+                        $tproduct_name .= "To : " . $card_details['to'];
+                    }
+                    if ( isset( $card_details['from'] ) && $card_details['from'] != "" ) {
+                        $tproduct_name .= "<br/> From : " . $card_details['from'];
+                    }
+                    if ( isset( $card_details['message'] ) && $card_details['message'] != "" ) {
+                        $tproduct_name .= "<br/> Message : " . $card_details['message'];
+                    }
+                    $children_product[] = array(
+                        'key'   => "<a href='" . get_permalink( $card_details['product_id'] ) . "'>" . get_the_title( $card_details['product_id'] ) . '</a>',
+                        'value' => $tproduct_name,
+                    );
+                }
+                
                 if ( $display_children_price ) {
                     $cart_item = array_merge( $cart_item, $children_product );
@@ -641 +779 @@
                 $product_url = wp_get_attachment_url( $product->get_image_id() );
             }
+            global  $doko_is_card_page ;
             $btn_text = sprintf(
-                '<a style="cursor:pointer;" data-quantity="%s" data-product-id="%s" data-product-price="%s" data-site-currency="%s" data-product-name="%s" data-image-url="%s" class="%s" data-product-variation-parent-id="%s" >%s</a>',
+                '<a style="cursor:pointer;" data-quantity="%s" data-product-id="%s" data-product-price="%s" data-site-currency="%s" data-product-name="%s" data-image-url="%s" class="%s" data-product-variation-parent-id="%s" data-card-mode="%s" >%s</a>',
                 esc_attr( ( isset( $args['quantity'] ) ? $args['quantity'] : 1 ) ),
                 $product->get_id(),
@@ -651 +790 @@
                 'button doko-add-to-box',
                 $product->get_parent_id(),
-                esc_html__( 'Add to box', 'doko' )
+                ( $doko_is_card_page ? "yes" : "no" ),
+                ( $doko_is_card_page ? esc_html__( 'Add card to box', 'doko' ) : esc_html__( 'Add to box', 'doko' ) )
             );
         }
@@ -667 +807 @@
      * @return void
      */
-    public function add_box_contents_order_line( WC_Order_Item $item, $cart_item_key, $values )
+    public function add_box_contents_order_line( $item, $cart_item_key, $values )
     {
         
         if ( isset( $values['box_contents'] ) ) {
+            $doko_children_products = array();
             $item->update_meta_data( 'Original Price', wc_price( $values['container']['product_price'] ) );
             foreach ( $values['box_contents'] as $screen_id => $screen_content ) {
                 $product_id = $screen_content['product_id'];
-                $variation_id = $screen_content['variation_id'];
+                $variation_id = 0;
+                
+                if ( isset( $screen_content['variation_id'] ) && $screen_content['variation_id'] != 0 ) {
+                    $product_id = $screen_content['variation_id'];
+                    $variation_id = $screen_content['variation_id'];
+                }
+                
                 $price = $screen_content['product_price'];
                 $qty = $screen_content['product_qty'];
                 $product = wc_get_product( $product_id );
-                $ptype = $product->get_type();
                 $product_name = $product->get_name();
-                
-                if ( 'variable' == $ptype && $variation_id != 0 ) {
-                    $product = wc_get_product( $variation_id );
-                    $product_name = $product->get_name();
+                $item->update_meta_data( "<a href='" . get_permalink( $product_id ) . "'>" . $product_name . '</a>', wc_price( $price ) . '  x' . $qty );
+                $data = array(
+                    'qty'          => $qty,
+                    'product_id'   => $product_id,
+                    'variation_id' => $variation_id,
+                );
+                $doko_children_products[] = $data;
+            }
+            
+            if ( isset( $values['card_details'] ) ) {
+                $card_details = $values['card_details'];
+                $tproduct_name = "";
+                if ( isset( $card_details['to'] ) && $card_details['to'] != "" ) {
+                    $tproduct_name .= "To : " . $card_details['to'];
                 }
-                
-                $item->update_meta_data( "<a href='" . get_permalink( $product_id ) . "'>" . $product_name . '</a>', wc_price( $price ) . '  x' . $qty );
-            }
-            $item->add_meta_data( 'doko_bunble_id', $values['bundle_id'], true );
-        }
-    
-    }
-    
-    /**
-     * Display variations separately.
-     *
-     * @param mixed $a Query.
-     *
-     * @return mixed
-     */
-    public function display_variations_separately( $a )
-    {
-        $page_url_id = $this->get_page_id();
-        $post_obj = get_post( $page_url_id );
-        
-        if ( has_shortcode( $post_obj->post_content, 'doko-bundles' ) || defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-            $product_ids = $a->ids;
-            $list_product_ids = array();
-            foreach ( $product_ids as $p_key => $product_id ) {
-                switch ( wc_get_product( $product_id )->get_type() ) {
-                    case 'simple':
-                        $list_product_ids[] = $product_id;
-                        break;
-                    case 'variable':
-                        $variations = wc_get_product( $product_id )->get_children();
-                        $list_product_ids = array_map( function ( $data ) {
-                            return $data;
-                        }, $variations );
-                        break;
-                    default:
-                        /**
-                         * Filter the product ids.
-                         *
-                         * @since 1.0.0
-                         */
-                        apply_filters( 'doko_edit_loop_products', $product_id );
-                        break;
+                if ( isset( $card_details['from'] ) && $card_details['from'] != "" ) {
+                    $tproduct_name .= "<br/> From : " . $card_details['from'];
                 }
-            }
-            $a->ids = $list_product_ids;
-        }
-        
-        return $a;
+                if ( isset( $card_details['message'] ) && $card_details['message'] != "" ) {
+                    $tproduct_name .= "<br/> Message : " . $card_details['message'];
+                }
+                $item->update_meta_data( "<a href='" . get_permalink( $card_details['product_id'] ) . "'>" . get_the_title( $card_details['product_id'] ) . '</a>', $tproduct_name );
+                $doko_children_products[] = array(
+                    'qty'        => $qty,
+                    'product_id' => $product_id,
+                );
+            }
+            
+            $item->add_meta_data( 'doko_bundle_id', $values['bundle_id'], true );
+            $item->add_meta_data( 'doko_children_bundle_ids', json_encode( $doko_children_products ) );
+        }
+    
     }
     
@@ -768 +893 @@
     }
     
-    private function display_bundle_products_screen( $package_data )
+    private function display_bundle_products_screen( $package_data, $is_card_screen = false )
     {
         $this->display_box_title( $package_data );
@@ -778 +903 @@
         
         if ( 'products' === $package_data['options'] ) {
-            echo  do_shortcode( '[products ids="' . implode( ',', $package_data['products'] ) . '"  orderby="date" columns="3" order="ASC"]' ) ;
+            echo  do_shortcode( '[doko_products ids="' . implode( ',', $package_data['products'] ) . '"  orderby="date" columns="3" order="ASC" is_card="$is_card_screen"]' ) ;
         } elseif ( 'categories' === $package_data['options'] ) {
-            hs_dk_display_products_from_categories( $package_data['categories'] );
+            hs_dk_display_products_from_categories( $package_data['categories'], $is_card_screen );
         }
         
@@ -797 +922 @@
     }
     
-    /**
-     * @param $query_args
-     * @param $atts
-     * @param $loop_name
-     * @return mixed
-     */
-    public function hide_out_of_stock_products( $query_args, $atts, $loop_name )
-    {
-        if ( $loop_name == 'products' && count( $this->get_data( $this->package_id ) ) > 0 ) {
-            $query_args['meta_query'] = array( array(
-                'key'     => '_stock_status',
-                'value'   => 'instock',
-                'compare' => 'LIKE',
-            ) );
-        }
-        return $query_args;
+    private function display_card_content_page( $package_data )
+    {
+        ?>
+        <div class="hs-dk-product-panel">
+            <?php 
+        echo  $this->display_bundle_products_screen( $package_data, true ) ;
+        ?>
+        </div>
+        <div class="hs-dk-product-card-panel">
+            <div class="hs-dk-card_row_1">
+            <h2><?php 
+        echo  esc_html__( 'Choose YOUR CARD', 'doko' ) ;
+        ?></h2>
+            <p class="hs-dk-card_text"><?php 
+        echo  esc_html__( 'Our team handwrites each and every note to keep.', 'doko' ) ;
+        ?></p>
+
+        </div>
+            <div class="hs-dk-doko_card_row_2">
+
+              <div class="hs-dk-card-image">
+                <img src class="hs-dk-card-image" alt="Card Image">
+                   <a class="hs-dk-change-card"><span>Change card</span></a>
+              </div>
+
+              <div class="hs-dk-card-details">
+
+                    <div class="hs-dk-input-bloc">
+
+                        <div class="hs-dk-input-container">
+                            <label for="to">To</label>
+                            <input class="hs-dk-input-container-to" type="text" id="to" placeholder="To">
+                        </div>
+
+                        <div class="hs-dk-input-container">
+                            <label for="from">From</label>
+                            <input class="hs-dk-input-container-from" type="text" id="from" placeholder="From">
+                        </div>
+
+                    </div>
+
+                    <div class="hs-dk-message-container">
+                        <!--label for="message">Add your personalized message here (optional)</label-->
+                        <textarea id="message-box" placeholder="" max-length="160"></textarea>
+                    </div>
+
+                    <p class="hs-dk-remaining-characters"><?php 
+        esc_html_e( '160 characters remaining', 'doko' );
+        ?></p>
+
+
+                    <div class="hs-dk-note-options">
+                        <label class="hs-dk-customer-checkbox">
+                            <input type="radio" name="doko-note-option" value="blank-card">
+
+                        <?php 
+        esc_html_e( " Leave card intentionally blank and we'll tuck the card in the bow for you to do what you need", 'doko' );
+        ?>
+                        </label>
+                        <label class="hs-dk-customer-checkbox">
+                            <input type="radio" name="doko-note-option" value="no-card">
+                           <?php 
+        esc_html_e( ' No note or card needed! Just a to/from is fine!', 'doko' );
+        ?>
+                        </label>
+                    </div>
+
+
+                    <button href="#next" class="doko-page-btn button button-primary"  data-btn-type="next"><?php 
+        esc_html_e( 'ADD TO CART', 'doko' );
+        ?></button>
+
+               </div>
+
+
+
+        </div>
+        </div>
+        <?php 
     }
 
@@ -819 +1007 @@
     $new_names = $names;
     foreach ( $new_names as $name_id => $name ) {
-        if ( $name->key == 'doko_bunble_id' && !is_admin() ) {
+        if ( $name->key == 'doko_bundle_id' && !is_admin() ) {
+            unset( $new_names[$name_id] );
+        }
+        if ( $name->key == 'doko_children_bundle_ids' ) {
             unset( $new_names[$name_id] );
         }
@@ -825 +1016 @@
     return $new_names;
 }, 999 );
+add_action(
+    'woocommerce_reduce_order_item_stock',
+    function ( $item, $change, $order ) {
+    
+    if ( $item->get_meta( 'doko_bundle_id' ) ) {
+        $children_products = $item->get_meta( 'doko_children_bundle_ids' );
+        $children_products = json_decode( $children_products, true );
+        $changes = array();
+        foreach ( $children_products as $key => $value ) {
+            $product_id = $value['product_id'];
+            if ( isset( $value['variation_id'] ) && $value['variation_id'] != 0 ) {
+                $product_id = $value['variation_id'];
+            }
+            $stock_avail = get_post_meta( $product_id, '_manage_stock', true );
+            
+            if ( $stock_avail == "yes" ) {
+                $qty = $value['qty'];
+                $product = wc_get_product( $product_id );
+                $new_stock = wc_update_product_stock( $product, $qty, 'decrease' );
+                $changes[] = array(
+                    'product' => $product,
+                    'from'    => $new_stock + $qty,
+                    'to'      => $new_stock,
+                );
+            }
+        
+        }
+        wc_trigger_stock_change_notifications( $order, $changes );
+    }
+
+},
+    10,
+    3
+);
+add_action( 'woocommerce_restore_order_stock', function ( $order ) {
+    foreach ( $order->get_items() as $item ) {
+        if ( !$item->is_type( 'line_item' ) ) {
+            continue;
+        }
+        $children_products = $item->get_meta( 'doko_children_bundle_ids' );
+        $children_products = json_decode( $children_products, true );
+        foreach ( $children_products as $key => $value ) {
+            $product_id = $value['product_id'];
+            if ( isset( $value['variation_id'] ) && $value['variation_id'] != 0 ) {
+                $product_id = $value['variation_id'];
+            }
+            $stock_avail = get_post_meta( $product_id, '_manage_stock', true );
+            $qty = $value['qty'];
+            $product = wc_get_product( $product_id );
+            
+            if ( $stock_avail == "yes" ) {
+                wc_update_product_stock( $product, $qty, 'increase' );
+                $order->add_order_note( __( 'Stock levels of product ', 'woocommerce' ) . $product->get_formatted_name() . ' has increased of ' . $qty );
+            }
+        
+        }
+    }
+} );

doko-box-builder/trunk/public/js/hs-doko-public.js

@@ -6 +6 @@
     window.doko.box_container = "";
     window.doko.box_contents = {};
+    window.doko.rules = {};
+    window.doko.screens = {};
+    window.doko.box_card = {};
+
+    let qty;
 
     $(document).ready(function() {
@@ -67 +72 @@
         $('div.hs-dk-bundle-page').hide()
         $('div.hs-dk-bundle-page[data-page-id="1"]').show()
+        $('div.hs-dk-menu-fix').hide()
+        $('div.hs-dk-product-card-panel').hide()
 
         var current_page = 1;
         window.doko.current_page = current_page;
+        $('div#giftbox-progress-bar div.step a').removeClass('completed');
+        $('div#giftbox-progress-bar div.step[data-step-id="'+current_page+'"] a').addClass('completed');
         $('button.doko-page-btn[data-btn-type="next"]').on('click', function() {
+
             if ( current_page + 1 > $('div.hs-dk-bundle-page').length ) {
                 return false;
@@ -77 +87 @@
 
             if ( undefined != doko_bundle_data ) {
-                if ( "" == window.doko.box_container ) {
-                    alert( doko_bundle_data['no-products-message'] );
-                    return false;
+                if ( wp.hooks.applyFilters('doko_restrict_first_page', true, current_page ) ) {
+                    if ( "" == window.doko.box_container ) {
+                        alert( doko_bundle_data['no-products-message'] );
+                        return false;
+                    }
                 }
             }
@@ -87 +99 @@
             }
 
+            current_page++;
             $('div.hs-dk-bundle-page').hide();
-            current_page++;
             $('div.hs-dk-bundle-page[data-page-id="'+current_page+'"]').show()
             $('div#giftbox-progress-bar div.step a').removeClass('completed');
             $('div#giftbox-progress-bar div.step[data-step-id="'+current_page+'"] a').addClass('completed');
             window.doko.current_page = current_page;
-
             wp.hooks.doAction( 'doko_after_click_navigate_to_page', current_page );
         });
@@ -104 +115 @@
             $('div.hs-dk-bundle-page').hide();
             current_page--;
+            console.log(current_page)
             $('div.hs-dk-bundle-page[data-page-id="'+current_page+'"]').show()
             $('div#giftbox-progress-bar div.step a').removeClass('completed');
@@ -119 +131 @@
             window.location.href = doko_object.cart_page_url;
         });
-    });
-
-
-    function hs_dk_init_delete_box_action( hash_code ) {
-
+
+
+
+
+
+
+    function hs_dk_init_delete_box_action( hash_code , trigger= false ) {
+
+        var jsonId = JSON.parse(doko_step_identifier);
+        var current_screen = window.doko.current_page;
+
+        var screenId = jsonId[current_screen];
         if ( $('table.doko-box-contents').length > 0 ) {
             $('table.doko-box-contents tr[data-product-id]').each( function() {
@@ -131 +150 @@
                     var productQty= parseInt( $('table.doko-box-contents tr[data-product-id="' + product_id + '"]').data('productQty') );
                     var price= parseFloat( $('table.doko-box-contents tr[data-product-id="' + product_id + '"]').data('productPrice') );
-                    wp.hooks.doAction( 'doko_before_delete_product_from_box', product_id, productQty, price, total_price, stored_total_price )
-
+                    wp.hooks.doAction( 'doko_before_delete_product_from_box', product_id, productQty, price );
+                    delete window.doko.box_contents[product_id];
+                    delete window.doko.screens[screenId][product_id];
+
+                    recalculate_total();
+
+                    $(this).parent().closest('tr').remove()
                     $('ul.box-images li[data-product-id="'+product_id+'"]').remove();
-                    $('table.doko-box-contents tr[data-product-id="' + product_id + '"]').remove();
-                    $('ul.doko-footer-navigation li[data-product-id="'+product_id+'"]').remove();
-                    var total_price = 0;
-                    var stored_total_price = window.doko.total_price;
-                    if ( hs_dk_has_decimals() ) {
-                        total_price = parseFloat( hs_dk_get_wc_price( stored_total_price, false ) - (price * productQty) );
-                    } else {
-                        total_price = parseInt( hs_dk_get_wc_price( stored_total_price, false ) - (price * productQty) )
-                    }
-                    window.doko.total_price = total_price;
-                    $('button.doko-total-btn').html('Total : '+ hs_dk_get_wc_price( window.doko.total_price  ) );
-
-                    wp.hooks.doAction( 'doko_after_delete_product_from_box', product_id, productQty, price, total_price, stored_total_price )
-                })
+                    $('ul.doko-box-contents li[data-product-id="' + product_id + '"]').remove();
+
+                    wp.hooks.doAction( 'doko_after_delete_product_from_box', product_id, productQty, price )
+                });
             });
         }
@@ -156 +170 @@
             var product_id =  $(this).closest('li').data('productId');
             $(this).closest('li').remove();
-            wp.hooks.doAction( 'doko_before_product_from_box', product_id, productQty, price, total_price, stored_total_price )
+            wp.hooks.doAction( 'doko_before_delete_product_from_box', product_id, productQty, price )
+            delete window.doko.box_contents[product_id];
+            delete window.doko.screens[screenId][product_id];
+            recalculate_total();
             $('ul.box-images li[data-product-id="'+product_id+'"]').remove();
-            $('table.doko-box-contents tr[data-product-id="' + product_id + '"]').remove();
-            $('ul.doko-footer-navigation li[data-product-id="'+product_id+'"]').remove();
-            var total_price = 0;
-            var stored_total_price = window.doko.total_price;
-
-            if ( hs_dk_has_decimals() ) {
-                total_price = parseFloat( hs_dk_get_wc_price( stored_total_price, false ) - ( hs_dk_get_wc_price( price, false ) * productQty) );
-            } else {
-                total_price = parseInt( hs_dk_get_wc_price( stored_total_price, false ) - ( hs_dk_get_wc_price( price, false ) * productQty) )
-            }
-
-            window.doko.total_price = total_price;
-            $('button.doko-total-btn').html('Total : '+ hs_dk_get_wc_price( window.doko.total_price  ) );
-
-            wp.hooks.doAction( 'doko_delete_product_from_box', product_id, productQty, price, total_price, stored_total_price )
-        });
-
-    }
+            $('ul.doko-box-contents li[data-product-id="' + product_id + '"]').remove();
+            wp.hooks.doAction( 'doko_after_delete_product_from_box', product_id, productQty, price )
+        });
+
+        if ( trigger ) {
+            $('li[data-hash-code="'+hash_code+'"] div.doko-right-sup-exposant').trigger('click');
+        }
+
+    }
+
+    window.hs_dk_init_delete_box_action = hs_dk_init_delete_box_action;
+    window.hs_dk_recalculate_total      = recalculate_total;
 
     /**
@@ -219 +230 @@
     }
 
+    window.hs_dk_get_wc_price = hs_dk_get_wc_price;
+
     function hs_dk_build_box_contents( product_qty, product_name, product_price, product_id ) {
         var html = '<tr data-product-id="'+product_id+'" data-product-qty="'+product_qty+'" data-product-price="'+product_price+'"><td>'+product_name+'</td><td>'+product_qty+'</td><td>'+ product_price +'</td>'
@@ -270 +283 @@
             var bundle_id = $('input[name="doko-bundle-page-id"]').val();
             var productData = {}
+            var cardMode = $(this).data('cardMode');
+            window.doko.cardMode = cardMode;
+
 
             // generate code to get data of a parent of multilevel wih data-page-id and data-product-id
@@ -281 +297 @@
             productData.current_page = dk_current_page;
             productData.bundle_id = bundle_id;
-            var total_price = window.doko.total_price;
             var product_name = $(this).data('productName')
 
@@ -288 +303 @@
             wp.hooks.doAction( 'doko_before_calculate_add_to_box', product_id, productData, window.doko.current_page, page_data );
 
-            if ( hs_dk_has_decimals() ) {
-                product_price = parseFloat( hs_dk_get_wc_price( product_price, false ) );
-                total_price += product_price;
+
+            productData.variation_id = parent_variation_id;
+
+            wp.hooks.doAction('doko_after_calculate_add_to_box', product_id, productData, window.doko.current_page, page_data);
+
+            if ( "no" == cardMode ) {
+                if ($('table.doko-box-contents').length > 0 && dk_current_page != 1) {
+                    var box_contents_html;
+                    box_contents_html = hs_dk_build_box_contents(product_quantity, product_name, product_price, product_id);
+
+                    if ($('table.doko-box-contents tbody tr[data-product-id="' + product_id + '"]').length == 0) {
+                        $('table.doko-box-contents tbody').append(box_contents_html);
+                        $('ul.box-images').append(hs_dk_build_img_block(product_img_url, false, productData ));
+                    } else {
+                        qty = $('ul.doko-box-contents li[data-product-id="' + product_id + '"] div.doko-qty-exposant').html();
+                        box_contents_html = hs_dk_build_box_contents(qty, product_name, product_price, product_id);
+                        $('table.doko-box-contents tr[data-product-id="' + product_id + '"]').replaceWith(box_contents_html)
+                    }
+
+                }
+
+                $('div.hs-dk-menu-fix').show();
+                hs_dk_init_delete_box_action(unique_id);
             } else {
-                product_price = parseInt( product_price );
-                total_price += product_price;
-            }
-
-            productData.variation_id = parent_variation_id;
-
-            window.doko.total_price = hs_dk_get_wc_price( total_price, false );
-
-            wp.hooks.doAction( 'doko_after_calculate_add_to_box', product_id, productData,  window.doko.current_page, page_data );
-
-            if ( $('table.doko-box-contents').length > 0 ) {
-                var box_contents_html ;
-                box_contents_html = hs_dk_build_box_contents( product_quantity, product_name, product_price,  product_id );
-
-                if ( $('table.doko-box-contents tbody tr[data-product-id="'+product_id+'"]').length == 0 ) {
-                    $('table.doko-box-contents tbody').append(box_contents_html);
+                $('div.hs-dk-menu-fix').hide();
+                $('img.hs-dk-card-image').attr('src', product_img_url )
+                $('div.hs-dk-product-card-panel').show()
+                $('div.hs-dk-product-panel').hide()
+                window.doko.box_card.product_id = product_id;
+
+            }
+
+            recalculate_total();
+        });
+
+        $('a.hs-dk-change-card').on('click', function(){
+            $('div.hs-dk-product-card-panel').hide()
+            $('div.hs-dk-product-panel').show()
+        });
+
+
+        $('input.hs-dk-input-container-to').on('change', function(){
+            window.doko.box_card.to = $(this).val()
+        });
+        $('input.hs-dk-input-container-to').trigger('change')
+
+        $('input.hs-dk-input-container-from').on('change', function(){
+            window.doko.box_card.from = $(this).val()
+        });
+        $('input.hs-dk-input-container-from').trigger('change')
+
+        $('#message-box').on('change', function(){
+            window.doko.box_card.message = $(this).val()
+        });
+        $('#message-box').trigger('change');
+
+
+    }
+
+        function recalculate_total() {
+            var screens = window.doko.screens;
+            var total = 0;
+
+            for (var sc in screens) {
+                var product = screens[sc];
+
+                if (product.qty !== undefined && product.amount !== undefined) {
+                    total += product.qty * product.amount;
                 } else {
-                    qty = product_quantity;
-                    box_contents_html = hs_dk_build_box_contents( qty, product_name, product_price,  product_id );
-                    $('table.doko-box-contents tr[data-product-id="'+product_id+'"]').replaceWith(box_contents_html)
+                    for (var ccd in product) {
+                        var data = product[ccd];
+
+                        if (data.qty !== undefined && data.amount !== undefined) {
+                            total += data.qty * data.amount;
+                        }
+                    }
                 }
-
-            }
-
-            $('button.doko-total-btn').html('Total : '+ hs_dk_get_wc_price( window.doko.total_price ) );
-            $('div.hs-dk-menu-fix').show();
-
-            hs_dk_init_delete_box_action( unique_id );
-        });
-    }
+            }
+            window.doko.total_price = total;
+
+            $('button.doko-total-btn').html('Total : ' + hs_dk_get_wc_price( total, true ) );
+        }
+
+
+
+
+        function hs_dk_build_img_block( product_img_url, is_bottom = true, productData ){
+
+            var li_class_name ="";
+            var div_class_name = "doko-icone-remove";
+            var i_class_name  = "";
+            if ( ! is_bottom ) {
+                li_class_name = 'doko-reset-icone-remove';
+                div_class_name = "doko-reset-icone";
+            }
+
+            return "<li class='"+li_class_name+"' data-product-id='"+productData.productId+"'><i ' style='cursor: pointer;' aria-hidden='true'></i></div><a class='selected-box' ><img class='box-color' src='"+product_img_url+"'></a></li>";
+        }
+
+    });
 
 

doko-box-builder/trunk/public/js/hs-doko-utils.js

@@ -26 +26 @@
             var puid = productData['unique_id'];
             var pvid = productData['variation_id'];
+            var step_identifier = JSON.parse(doko_step_identifier);
 
             if ( current_page == 1 ) {
-                if ( undefined != doko_bundle_data ) {
-                    var enable_redirect = doko_bundle_data['enable-screen-redirect'];
-                    // todo : enable single choice or multiple choices.
-                    if ( "" != window.doko.box_container ) {
-                        var pprice = window.doko.box_container['product_price'] * window.doko.box_container['product_qty'];
-                        window.doko.total_price = parseFloat(window.doko.total_price) - parseFloat(pprice);
-                    }
-                    window.doko.box_container = {
-                        product_id : pid,
-                        product_qty: pqty,
-                        product_price : pprice,
-                        unique_id : puid,
-                        variation_id : pvid
-                    };
-                    var elemUL =  $('ul.doko-box-container');
-                    hs_dk_add_li_to_box( productData, elemUL, true,  true );
-                    if ( "yes" == enable_redirect ){
-                        $('button.doko-page-btn[data-btn-type="next"]').trigger('click');
+                if ( wp.hooks.applyFilters('doko_execute_rule_on_page' , true , current_page ) ) {
+                    if ( undefined != doko_bundle_data ) {
+                        var enable_redirect = wp.hooks.applyFilters('doko_enable_first_page_redirect', doko_bundle_data['enable-screen-redirect'] , current_page );
+                        if ( "" != window.doko.box_container ) {
+                            var pprice = window.doko.box_container['product_price'] * window.doko.box_container['product_qty'];
+                            window.doko.total_price = parseFloat(window.doko.total_price) - parseFloat(pprice);
+                        }
+                        window.doko.box_container = {
+                            product_id : pid,
+                            product_qty: pqty,
+                            product_price : pprice,
+                            unique_id : puid,
+                            variation_id : pvid
+                        };
+                        window.doko.screens['first-step'] = {
+                            qty : productData['quantity'],
+                            amount : productData['productPrice']
+                        }
+
+                        var elemUL =  $('ul.doko-box-container');
+                        hs_dk_add_li_to_box( productData, elemUL, true,  true );
+
+                        if ( "yes" == enable_redirect ){
+                            $('ul.doko-btn-navigation button.doko-page-btn[data-btn-type="next"]').trigger('click');
+                        }
                     }
                 }
             } else {
-                var elemUL =  $('ul.doko-box-contents');
-                hs_dk_add_li_to_box( productData, elemUL, false,  true );
+                if ( wp.hooks.applyFilters('doko_execute_rule_on_page' , true , current_page ) ) {
+                    var elemUL =  $('ul.doko-box-contents');
+                    if ( wp.hooks.applyFilters('doko_add_product_to_navigation', true , current_page ) ) {
+                        hs_dk_add_li_to_box( productData, elemUL, false,  true );
+                    }
 
-                if ( window.doko.box_contents.hasOwnProperty( pid ) ) {
-                    window.doko.box_contents[pid]['product_qty'] += 1;
-                } else {
-                    window.doko.box_contents[pid] =  {
-                        product_id : pid,
-                        product_qty: pqty,
-                        product_price : pprice,
-                        unique_id : puid,
-                        variation_id : pvid
-                    };
+                    if ( window.doko.box_contents.hasOwnProperty( pid ) ) {
+                        window.doko.box_contents[pid]['product_qty'] += pqty;
+                        window.doko.screens[step_identifier[current_page]][pid]['qty'] += productData['quantity'];
+
+                    } else {
+                        if ( window.doko.cardMode == "no" ) {
+                            window.doko.box_contents[pid] =  {
+                                product_id : pid,
+                                product_qty: pqty,
+                                product_price : pprice,
+                                unique_id : puid,
+                                variation_id : pvid
+                            };
+
+                            var sidentifier = step_identifier[current_page];
+                            if ( undefined == window.doko.screens[sidentifier] ) {
+                                window.doko.screens[sidentifier] = {}
+                            }
+
+                            if ( undefined == window.doko.screens[sidentifier][pid] ) {
+                                window.doko.screens[sidentifier][pid] = {}
+                            }
+
+
+                            window.doko.screens[sidentifier][pid] = {
+                                qty : productData['quantity'],
+                                amount : productData['productPrice']
+                            }
+                        }
+                    }
                 }
-                
-
             }
-        }, 10, 3);
+            wp.hooks.doAction('doko_execute_rule', current_page, pid, pqty, pprice, puid, pvid );
+        }, 30, 3);
 
         wp.hooks.addAction('doko_delete_product_from_box', 'doko', function( product_id ) {
@@ -82 +112 @@
                     'contents' : window.doko.box_contents,
                     'total_price' : window.doko.total_price,
+                    'card_details' : window.doko.box_card
                 }
                 $.post(
@@ -88 +119 @@
                         contents : doko_products,
                         bundle_id : $('div[data-bundle-id]').data('bundleId'),
+
                     }, function( response ) {
                         var json_resp = JSON.parse( response );
@@ -97 +129 @@
                             $('div.doko-spinner-loading').show();
                             $('div.doko-spinner-complete').hide();
+                            // todo : add the ability to display error messages.
                         }
                     }
@@ -116 +149 @@
 
             if ( remove ) {
+                // responsible for the box container.
                 $(parent_sibling).empty();
                 var html = "<li class='"+li_class_name+"' data-product-qty='"+qty+"' data-product-price='"+product_price+"' data-product-id='"+product_id+"' data-hash-code='"+hash_code+"'><i style='cursor: pointer;' aria-hidden='true'></i><a class='selected-box' ><img class='box-color' src='"+product_img_url+"'></a> "
@@ -126 +160 @@
                 $(parent_sibling).append(html).css('display','flex').css('list-style-type', 'none')
                 $(parent_sibling).find('li img').css('height','56px');
+                window.doko.rules = {}
             } else {
-
+                // responsible for the box contents.
                 if ( $(parent_sibling).find('li[data-product-id="'+product_id+'"]').length > 0 ) {
                     var product_qty = $(parent_sibling).find('li[data-product-id="'+product_id+'"]').attr('data-product-qty');
@@ -151 +186 @@
 
 })( jQuery );
+
+function check_in_list( value, array ) {
+    return array.indexOf(value) > -1;
+}
+
+window.hs_dk_check_in_list = check_in_list;