From b6dd44ae23fe378b9d857ab38a9f1318d0d6274f Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Fri, 28 Sep 2018 07:05:48 +0000 Subject: - Produktbearbeitung Backend - Neue Calculation für das Backend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7173 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/order/add.phtml | 9 + views/order/backendEdit/addDiscount.phtml | 33 + views/order/backendEdit/addProduct.phtml | 79 ++ .../backendEdit/addProduct_product_selected.phtml | 72 ++ views/order/backendEdit/editPayShipping.phtml | 108 +++ views/order/index.phtml | 73 +- views/order/product_table.phtml | 252 ++++++ views/order/view.phtml | 27 +- views/order/view_orderdata.phtml | 997 ++++----------------- 9 files changed, 831 insertions(+), 819 deletions(-) create mode 100644 views/order/add.phtml create mode 100644 views/order/backendEdit/addDiscount.phtml create mode 100644 views/order/backendEdit/addProduct.phtml create mode 100644 views/order/backendEdit/addProduct_product_selected.phtml create mode 100644 views/order/backendEdit/editPayShipping.phtml create mode 100644 views/order/product_table.phtml (limited to 'views/order') diff --git a/views/order/add.phtml b/views/order/add.phtml new file mode 100644 index 0000000..f9410b8 --- /dev/null +++ b/views/order/add.phtml @@ -0,0 +1,9 @@ +view['oCalculation']; + + $arTax = $oCalculation->getTaxLabelArray(); + + if ($this->getBackendTaxView() === WPSG_NETTO) $strBN = 'NETTO'; + else $strBN = 'BRUTTO'; + + $arCalculation = $oCalculation->getCalculationArray(); + +?> + +
+ + get_option('wpsg_currency'), $strBN), @$arCalculation['discount'][0]['set']); ?> + + +
+ + diff --git a/views/order/backendEdit/addProduct.phtml b/views/order/backendEdit/addProduct.phtml new file mode 100644 index 0000000..afd946b --- /dev/null +++ b/views/order/backendEdit/addProduct.phtml @@ -0,0 +1,79 @@ + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ + \ No newline at end of file diff --git a/views/order/backendEdit/addProduct_product_selected.phtml b/views/order/backendEdit/addProduct_product_selected.phtml new file mode 100644 index 0000000..ba13724 --- /dev/null +++ b/views/order/backendEdit/addProduct_product_selected.phtml @@ -0,0 +1,72 @@ +view['oProduct']; + + /** @var wpsg_order_product $oOrderProduct */ + $oOrderProduct = $this->view['oOrderProduct']; + +?> + + + +getProductName(); ?> + +
+ + + + + + + + imagehandler->getAttachmentID($oProduct->id); + + ?> + + +
+ + + getBackendTaxView() === WPSG_BRUTTO)?'(BRUTTO)':'(NETTO'), (($oOrderProduct !== false)?$oOrderProduct->getPrice($this->getBackendTaxView()):$oProduct->getPrice($this->getBackendTaxView()))); ?> + getCount():'1')); ?> + + callMod('wpsg_mod_productvariants', 'isVariantsProduct', [$oProduct->id])) { $arVariants = $this->callMod('wpsg_mod_productvariants', 'getVariants', [$oProduct->id, true, true, true]); ?> + + + +
+ + $var_data) { + + $arVariSelect = []; + foreach ($var_data['arVariation'] as $vari_id => $vari_data) $arVariSelect[$vari_id] = $vari_data['name']; + + ?> + + + + + + + + + + + +
\ No newline at end of file diff --git a/views/order/backendEdit/editPayShipping.phtml b/views/order/backendEdit/editPayShipping.phtml new file mode 100644 index 0000000..a38ac1c --- /dev/null +++ b/views/order/backendEdit/editPayShipping.phtml @@ -0,0 +1,108 @@ +arShipping as $shipping_id => $shipping_data) { + + $arShippingSelect[$shipping_id] = $shipping_data['name']; + + if (wpsg_isSizedDouble($shipping_data['price'])) { + + $arShippingSelect[$shipping_id] .= ' ('.wpsg_ff($shipping_data['price'],$this->get_option('wpsg_currency')).')'; + + } + + } + + $arPaymentSelect = []; + foreach ($this->arPayment as $payment_id => $payment_data) { + + $arPaymentSelect[$payment_id] = $payment_data['name']; + + if (wpsg_isSizedDouble($payment_data['preis'])) { + + $arPaymentSelect[$payment_id] .= ' ('.wpsg_ff($payment_data['preis'],$this->get_option('wpsg_currency')).')'; + + } + + } + + if ($this->getBackendTaxview() === WPSG_BRUTTO) { + + $price_shipping = wpsg_ff($this->view['data']['price_shipping_brutto'], $this->get_option('wpsg_currency')); + $price_payment = wpsg_ff($this->view['data']['price_payment_brutto'], $this->get_option('wpsg_currency')); + + $price_suffix = ' ('.__('Brutto', 'wpsg').')'; + + } else { + + $price_shipping = wpsg_ff($this->view['data']['price_shipping_brutto'], $this->get_option('wpsg_currency')); + $price_payment = wpsg_ff($this->view['data']['price_payment_brutto'], $this->get_option('wpsg_currency')); + + $price_suffix = ' ('.__('Netto', 'wpsg').')'; + + } + +?> + +
+ + view['data']['type_shipping']); ?> + + +
+ + view['data']['type_payment']); ?> + + +
+ + diff --git a/views/order/index.phtml b/views/order/index.phtml index aca2971..49c401e 100644 --- a/views/order/index.phtml +++ b/views/order/index.phtml @@ -23,6 +23,7 @@ view['tabs']['left'] as $k => $tab) { ?> +