From b7ab761a25a8c0879d0d466a508ee15e79d21695 Mon Sep 17 00:00:00 2001
From: Almira Krdzic <a.lmirakrdic@gmail.com>
Date: Wed, 17 Oct 2018 19:38:41 +0200
Subject: [PATCH] Handle bundle pricing on separate page

---
 .../class-wiaas-admin-package-pricing.php     |  18 +-
 .../pricing/views/html-package-pricing.php    | 167 +++++++++++-------
 2 files changed, 116 insertions(+), 69 deletions(-)

diff --git a/backend/app/plugins/wiaas/includes/admin/pricing/class-wiaas-admin-package-pricing.php b/backend/app/plugins/wiaas/includes/admin/pricing/class-wiaas-admin-package-pricing.php
index f09555b..b1cee72 100644
--- a/backend/app/plugins/wiaas/includes/admin/pricing/class-wiaas-admin-package-pricing.php
+++ b/backend/app/plugins/wiaas/includes/admin/pricing/class-wiaas-admin-package-pricing.php
@@ -11,6 +11,8 @@ class Wiaas_Admin_Package_Pricing {
 
 	public static function init() {
 
+		add_action( 'admin_menu', array(__CLASS__, 'add_package_pricing_editor_page') );
+
 		add_action( 'woocommerce_product_data_tabs', array( __CLASS__, 'package_data_tabs' ) );
 		add_action( 'woocommerce_product_data_panels', array( __CLASS__, 'package_data_panel' ) );
 
@@ -19,6 +21,18 @@ class Wiaas_Admin_Package_Pricing {
 		add_action( 'woocommerce_process_product_meta', array( __CLASS__, 'process_meta_box' ), 1, 2 );
 	}
 
+	public static function add_package_pricing_editor_page() {
+
+		add_submenu_page(
+			'edit.php?post_type=product',
+			__( 'Products', 'wiaas' ),
+			null,
+			'create_products',
+			'wiaas-package_price_editor',
+			array(__CLASS__, 'package_data_panel')
+		);
+	}
+
 	/**
 	 * Creates and renders new empty package pricing rule
 	 */
@@ -54,8 +68,8 @@ class Wiaas_Admin_Package_Pricing {
 	 */
 	public static function package_data_panel() {
 
-		global $post;
-		$package           = wc_get_product( $post->ID );
+		$package_id = absint($_GET['id']);
+		$package           = wc_get_product( $package_id );
 		$pricing_rules = Wiaas_Package_Pricing::get_package_prices($package);
 		$commission = Wiaas_Package_Pricing::get_package_pricing_commission($package);
 		$max_cost_margin = Wiaas_Package_Pricing::get_package_max_cost_margin($package);
diff --git a/backend/app/plugins/wiaas/includes/admin/pricing/views/html-package-pricing.php b/backend/app/plugins/wiaas/includes/admin/pricing/views/html-package-pricing.php
index ac092ff..e70628c 100644
--- a/backend/app/plugins/wiaas/includes/admin/pricing/views/html-package-pricing.php
+++ b/backend/app/plugins/wiaas/includes/admin/pricing/views/html-package-pricing.php
@@ -143,81 +143,114 @@ if ( ! defined( 'ABSPATH' ) ) {
             }
         });
 	</script>
+</div>
 
-    <div class="options_group">
-        <?php
-        woocommerce_wp_text_input(
-	        array(
-		        'id'        => '_wiaas_max_cost_margin',
-		        'name'      => 'wiaas_max_cost_margin',
-		        'value'     => $max_cost_margin,
-		        'label'     => __( 'Max cost margin:', 'wiaas' ),
-		        'type'      => 'number',
-	        )
-        );
-        ?>
-    </div>
+<div class="wrap">
+    <div class="poststuff">
+        <div id="post-body" class="metabox-holder columns-2">
 
-    <div class="options_group">
-        <?php
-        woocommerce_wp_text_input(
-	        array(
-		        'id'        => '_wiaas_price_commision',
-		        'name' => 'wiaas_pricing_rules_commision',
-		        'value'     => $commission,
-		        'label'     => __( 'Commision (Percent):', 'wiaas' ),
-		        'type' => 'number',
-	        )
-        );
-        ?>
-    </div>
+            <div id="postbox-container-1" class="postbox-container">
 
-    <div class="options_group">
-        <div class="wc-metaboxes-wrapper">
-	        <?php
-	        $has_available_pay_types = false;
-	        $available_pay_types =  Wiaas_Package_Pricing::get_available_pay_types();
-	        foreach ($available_pay_types as $name => $pay_type) {
-		        if (!isset($pricing_rule_sets[$name])) {
-			        $has_available_pay_types = true;
-			        break;
-		        }
-	        }
+                <div class="postbox">
+                    <div class="inside">
+                        <div class="panel-wrap">
 
-	        $class = $has_available_pay_types ? '' : 'wiaas_hidden';
+                            <div class="panel">
+                                <h3>Test</h3>
+                            </div>
 
-	        ?>
-            <div id="wiaas_package_price_controls" class="toolbar toolbar-top <?php echo $class ?>">
-                <select id="wiaas_pay_type" name="wiaas-pay-type" class="pricing_rule_mode">
-		            <?php
-		            foreach ($available_pay_types as $name => $pay_type) {
-			            ?>
-                        <option
-                                value="<?php echo $name ?>"
-                                id="wiaas_pay_type_<?php echo $name ?>"
-                                class="<?php echo $class ?>"
-                        >
-				            <?php _e( $pay_type['title'], 'wiaas' ); ?>
-                        </option>
-			            <?php
-		            }
-		            ?>
-                </select>
-                <button
-                        title="<?php _e( 'Add pricing type.', 'wiaas' ); ?>"
-                        id="wiaas-add-pricing"
-                        type="button"
-                        class="button button-primary">
-		            <?php _e( 'Add Pricing Type', 'wiaas' ); ?>
-                </button>
+                        </div>
+                    </div>
+                </div>
             </div>
 
-            <div id="wiaas_package_pricing_rules" class="wc-metaboxes">
-	            <?php
-	            require 'html-package-pricing-rules-list.php';
-	            ?>
-            </div>
+            <div id="postbox-container-2" class="postbox-container">
 
+                <div class="postbox">
+                    <div class="inside">
+                        <div class="panel-wrap">
+                            <div class="wrap">
+                                <div class="options_group">
+		                            <?php
+		                            woocommerce_wp_text_input(
+			                            array(
+				                            'id'        => '_wiaas_max_cost_margin',
+				                            'name'      => 'wiaas_max_cost_margin',
+				                            'value'     => $max_cost_margin,
+				                            'label'     => __( 'Max cost margin:', 'wiaas' ),
+				                            'type'      => 'number',
+			                            )
+		                            );
+		                            ?>
+                                </div>
+
+                                <div class="options_group">
+		                            <?php
+		                            woocommerce_wp_text_input(
+			                            array(
+				                            'id'        => '_wiaas_price_commision',
+				                            'name' => 'wiaas_pricing_rules_commision',
+				                            'value'     => $commission,
+				                            'label'     => __( 'Commision (Percent):', 'wiaas' ),
+				                            'type' => 'number',
+			                            )
+		                            );
+		                            ?>
+                                </div>
+
+                                <div class="options_group">
+                                    <div class="wc-metaboxes-wrapper">
+			                            <?php
+			                            $has_available_pay_types = false;
+			                            $available_pay_types =  Wiaas_Package_Pricing::get_available_pay_types();
+			                            foreach ($available_pay_types as $name => $pay_type) {
+				                            if (!isset($pricing_rule_sets[$name])) {
+					                            $has_available_pay_types = true;
+					                            break;
+				                            }
+			                            }
+
+			                            $class = $has_available_pay_types ? '' : 'wiaas_hidden';
+
+			                            ?>
+                                        <div id="wiaas_package_price_controls" class="toolbar toolbar-top <?php echo $class ?>">
+                                            <select id="wiaas_pay_type" name="wiaas-pay-type" class="pricing_rule_mode">
+					                            <?php
+					                            foreach ($available_pay_types as $name => $pay_type) {
+						                            ?>
+                                                    <option
+                                                            value="<?php echo $name ?>"
+                                                            id="wiaas_pay_type_<?php echo $name ?>"
+                                                            class="<?php echo $class ?>"
+                                                    >
+							                            <?php _e( $pay_type['title'], 'wiaas' ); ?>
+                                                    </option>
+						                            <?php
+					                            }
+					                            ?>
+                                            </select>
+                                            <button
+                                                    title="<?php _e( 'Add pricing type.', 'wiaas' ); ?>"
+                                                    id="wiaas-add-pricing"
+                                                    type="button"
+                                                    class="button button-primary">
+					                            <?php _e( 'Add Pricing Type', 'wiaas' ); ?>
+                                            </button>
+                                        </div>
+
+                                        <div id="wiaas_package_pricing_rules" class="wc-metaboxes">
+				                            <?php
+				                            require 'html-package-pricing-rules-list.php';
+				                            ?>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </div>