Index: /mods/wpsg_mod_minquantity.class.php =================================================================== --- /mods/wpsg_mod_minquantity.class.php (revision 7482) +++ /mods/wpsg_mod_minquantity.class.php (revision 7483) @@ -62,5 +62,7 @@ #$product_content['general']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_minquantity/produkt_addedit_allgemein.phtml', false); + $this->shop->view['arSubAction']['stock']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_minquantity/produkt_addedit_allgemein.phtml', false); + } Index: /mods/wpsg_mod_minrequest.class.php =================================================================== --- /mods/wpsg_mod_minrequest.class.php (revision 7482) +++ /mods/wpsg_mod_minrequest.class.php (revision 7483) @@ -26,5 +26,18 @@ public function install() { - + + require_once(WPSG_PATH_WP.'/wp-admin/includes/upgrade.php'); + + /* + * Produkt Tabelle erweitern + */ + $sql = "CREATE TABLE ".WPSG_TBL_PRODUCTS." ( + wpsg_mod_minrequest_product_activ INT(11) NOT NULL, + wpsg_mod_minrequest_value DOUBLE(10,2) NOT NULL, + wpsg_mod_minrequest_valuemax DOUBLE(10,2) NOT NULL + ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;"; + + dbDelta($sql); + } // public function install() @@ -39,8 +52,58 @@ { + $this->shop->update_option('wpsg_mod_minrequest_productamount', $_REQUEST['wpsg_mod_minrequest_productamount'], false, false, WPSG_SANITIZE_CHECKBOX); + $this->shop->update_option('wpsg_mod_minrequest_productamount_max', $_REQUEST['wpsg_mod_minrequest_productamount_max'], false, false, WPSG_SANITIZE_CHECKBOX); $this->shop->update_option('wpsg_mod_minrequest_basketamount', $_REQUEST['wpsg_mod_minrequest_basketamount'], false, false, WPSG_SANITIZE_FLOAT); $this->shop->update_option('wpsg_mod_minrequest_basketmaxamount', $_REQUEST['wpsg_mod_minrequest_basketmaxamount'], false, false, WPSG_SANITIZE_FLOAT); } // public function settings_save() + + /* + * zeigt die Staffelpreise im Produktbackend an + */ + public function product_addedit_content(&$product_content, &$product_data) + { + + if (wpsg_isSizedInt($product_data['id'])) + { + + $product_data = wpsg_array_merge($product_data, $this->db->fetchRow(" + SELECT + `wpsg_mod_minrequest_value`,`wpsg_mod_minrequest_valuemax`, `wpsg_mod_minrequest_product_activ` + FROM + `".WPSG_TBL_PRODUCTS."` + WHERE + `id` = '".wpsg_q($product_data['id'])."' + ")); + + } + + $product_data['arMinrequest_value'] = explode(',', $this->shop->get_option('wpsg_mod_minrequest_value')); + $product_data['arMinrequest_valuemax'] = explode(',', $this->shop->get_option('wpsg_mod_minrequest_valuemax')); + $product_content['price']['content'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_minrequest/produkt_addedit_allgemein.phtml', false); + + + }//public function product_addedit_content(&$product_content, &$product_data) + + + public function produkt_edit_allgemein(&$produkt_data) + { + + $this->shop->view['wpsg_mod_minrequest']['product_activ'] = $produkt_data['wpsg_mod_minrequest_product_activ']; + $this->shop->view['wpsg_mod_minrequest']['value'] = $produkt_data['wpsg_mod_minquantity_value']; + $this->shop->view['wpsg_mod_minrequest']['valuemax'] = $produkt_data['wpsg_mod_minrequest_valuemax']; + + //$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_minquantity/produkt_edit_allgemein.phtml'); + + } // public function produkt_edit_allgemein(&$produkt_data) + + public function produkt_save_before(&$produkt_data) + { + + $produkt_data['wpsg_mod_minrequest_product_activ'] = wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_minrequest']['product_activ'])); + $produkt_data['wpsg_mod_minrequest_value'] = wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_minrequest']['value'])); + $produkt_data['wpsg_mod_minrequest_valuemax'] = wpsg_tf(wpsg_sinput("key", $_REQUEST['wpsg_mod_minrequest']['valuemax'])); + + } // public function produkt_save_before(&$produkt_data) public function checkBasket(&$bNoErrorBasket) @@ -138,4 +201,33 @@ } // private function _checkBasketMax($arBasket) + + /** + * Gibt den Mindestbestellwert anhand der ProduktID zurÃŒck + * @param int $product_id + * @return boolean + */ + public function getMinRequest($product_id) + { + + $product_data = $this->shop->cache->loadProduct($product_id); + + return $product_data['wpsg_mod_minrequest_value']; + + } // public function getMinRequest($product_id) + + /** + * Gibt den Maximalbestellwert anhand der ProduktID zurÃŒck + * @param int $product_id + * @return boolean + */ + public function getMaxRequest($product_id) + { + + $product_data = $this->shop->cache->loadProduct($product_id); + + return $product_data['wpsg_mod_minrequest_valuemax']; + + } // public function getMaxRequest($product_id) + } // class wpsg_mod_minrequest extends wpsg_mod_basic Index: /views/mods/mod_minrequest/produkt_addedit_allgemein.phtml =================================================================== --- /views/mods/mod_minrequest/produkt_addedit_allgemein.phtml (revision 7483) +++ /views/mods/mod_minrequest/produkt_addedit_allgemein.phtml (revision 7483) @@ -0,0 +1,31 @@ + + +
+
+

+ +

+
+
+ + view['wpsg_mod_minrequest']['data'][0]); ?> + + hasMod('wpsg_mod_minrequest') && $this->get_option('wpsg_mod_minrequest_productamount') == '1') { ?> + view['wpsg_mod_minrequest']['value']); ?> + + + hasMod('wpsg_mod_minrequest') && $this->get_option('wpsg_mod_minrequest_productamount_max') == '1') { ?> + view['wpsg_mod_minrequest']['valuemax']); ?> + + +

+ + +
+
Index: /views/mods/mod_minrequest/produkt_edit_allgemein.phtml =================================================================== --- /views/mods/mod_minrequest/produkt_edit_allgemein.phtml (revision 7483) +++ /views/mods/mod_minrequest/produkt_edit_allgemein.phtml (revision 7483) @@ -0,0 +1,9 @@ + +view['wpsg_mod_minrequest']['value']); ?> +view['wpsg_mod_minrequest']['valuemax']); ?> Index: /views/mods/mod_minrequest/settings_edit.phtml =================================================================== --- /views/mods/mod_minrequest/settings_edit.phtml (revision 7482) +++ /views/mods/mod_minrequest/settings_edit.phtml (revision 7483) @@ -8,4 +8,9 @@ ?> +get_option('wpsg_mod_minrequest_productamount'), array('help' => 'wpsg_mod_minrequest_productamount')); ?> +get_option('wpsg_mod_minrequest_productamount_max'), array('help' => 'wpsg_mod_minrequest_productamount_max')); ?> + +
+ get_option('wpsg_mod_minrequest_basketamount')), array('hint' => __('Gilt fÃŒr den Brutto Produktpreis. (Ohne Versand- und Zahlungskosten)', 'wpsg'), 'help' => 'wpsg_mod_minrequest_basketamount', 'unit' => $this->get_option('wpsg_currency'))); ?> get_option('wpsg_mod_minrequest_basketmaxamount')), array('hint' => __('Gilt fÃŒr den Brutto Produktpreis. (Ohne Versand- und Zahlungskosten)', 'wpsg'), 'help' => 'wpsg_mod_minrequest_basketmaxamount', 'unit' => $this->get_option('wpsg_currency'))); ?> Index: /views/mods/mod_voucherproduct/order_view_sidebar_content.phtml =================================================================== --- /views/mods/mod_voucherproduct/order_view_sidebar_content.phtml (revision 7482) +++ /views/mods/mod_voucherproduct/order_view_sidebar_content.phtml (revision 7483) @@ -13,11 +13,16 @@ callMod('wpsg_mod_voucherproduct', 'hasFile', array($this->view['wpsg_mod_voucherproduct']['order_id'], $d['id']))) { ?> -  /  - +  /  + + +  /  + + +  (get_option('wpsg_currency'))?>)  () - +