Index: /controller/wpsg_BasketController.class.php =================================================================== --- /controller/wpsg_BasketController.class.php (revision 8007) +++ /controller/wpsg_BasketController.class.php (revision 8010) @@ -256,4 +256,11 @@ $this->shop->basket->initFromSession(); + // Basket muss aufgebaut sein + $this->shop->checkShippingAvailable(); + $this->shop->checkPaymentAvailable(); + $this->shop->checkCustomerPreset(); + + \wpsg\wpsg_calculation::getSessionCalculation()->update(); + // Wenn keine Produkte drin sind, dann mit Fehlermeldung zum Warenkorb leiten $temp = $this->shop->basket->getProductIDs(); @@ -286,5 +293,5 @@ } - + $this->shop->view['pflicht'] = $this->shop->loadPflichtFeldDaten(); @@ -293,8 +300,5 @@ $this->shop->view['basket'] = $this->shop->basket->toArray(); - - $this->shop->checkShippingAvailable(); - $this->shop->checkPaymentAvailable(); - + if (!isset($this->shop->arShipping[$this->shop->view['basket']['checkout']['shipping']]) || !isset($this->shop->arShipping[$this->shop->view['basket']['checkout']['payment']])) { Index: /lib/wpsg_basket.class.php =================================================================== --- /lib/wpsg_basket.class.php (revision 8007) +++ /lib/wpsg_basket.class.php (revision 8010) @@ -958,6 +958,5 @@ * ÜberprÃŒft die Korrektheit der Kunden- und Bestelldaten */ - public function checkCheckout($state = true) - { + public function checkCheckout($state = true) { $bError = false; Index: /lib/wpsg_calculation.class.php =================================================================== --- /lib/wpsg_calculation.class.php (revision 8007) +++ /lib/wpsg_calculation.class.php (revision 8010) @@ -1305,5 +1305,5 @@ } - + // Shipping if (isset($_SESSION['wpsg']['checkout']['shipping']) && array_key_exists($_SESSION['wpsg']['checkout']['shipping'], $this->shop->arShipping)) { Index: /model/wpsg_exception.class.php =================================================================== --- /model/wpsg_exception.class.php (revision 8007) +++ /model/wpsg_exception.class.php (revision 8010) @@ -61,4 +61,6 @@ public static function getSanitizeException() { + debug_print_backtrace(); + return new \Exception('Parameterfehler'); Index: /model/wpsg_product.class.php =================================================================== --- /model/wpsg_product.class.php (revision 8007) +++ /model/wpsg_product.class.php (revision 8010) @@ -757,5 +757,5 @@ */ public static function find($arFilter = array(), $load = true) { - + list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter); @@ -791,5 +791,5 @@ // Wenn ich die nicht kaufbaren Produkte rausfiltern will, kann ich es nicht auf einen DB Query beschrÀnken, da ich die Module anfragen muss - //if (wpsg_isSizedInt($arFilter['hideNotBuyable'])) $force_load = true; + if (wpsg_isSizedInt($arFilter['hideNotBuyable'])) $force_load = true; foreach ($arID as $id) { @@ -799,5 +799,5 @@ $arReturn[$id] = self::getInstance($id); - //if (wpsg_isSizedInt($arFilter['hideNotBuyable']) && !$arReturn[$id]->canOrder()) { unset($arReturn[$id]); continue; } + if (wpsg_isSizedInt($arFilter['hideNotBuyable']) && !$arReturn[$id]->canOrder()) { unset($arReturn[$id]); continue; } // StandardmÀßig werden nicht anzeigbare Produkte ausgeblendet Index: /mods/mod_rechnungen/wpsg_invoice.php =================================================================== --- /mods/mod_rechnungen/wpsg_invoice.php (revision 8007) +++ /mods/mod_rechnungen/wpsg_invoice.php (revision 8010) @@ -50,6 +50,20 @@ } + + public function getDate($format = null) { + + if ($format === null) return $this->__get('datum'); + else if ($format === true) return $this->getDate('d.m.Y H:i:s'); + else return date($format, strtotime($this->__get('datum'))); + + } - public function getNr($bLink = false) { + /** + * @param bool $bLink + * @param \wpsg_order_product $oOrderProduct + * + * @return string + */ + public function getNr($bLink = false, $oOrderProduct = null) { $strReturn = ''; @@ -57,5 +71,7 @@ if ($bLink) { - $strReturn .= ''; @@ -65,4 +81,23 @@ if ($this->isInvoice()) $strReturn .= 'R '.$this->__get('rnr'); else if ($this->isStorno()) $strReturn .= 'RK '.$this->__get('gnr'); + + if ($oOrderProduct !== null) { + + $invoice_data = json_decode($oOrderProduct->getMeta('wpsg_mod_rechnungen_data', false, 'null'), true); + if ($invoice_data !== null) { + + foreach ($invoice_data as $id) { + + if ($id['invoice_id'] === $this->getId()) { + + $strReturn .= ' ('.$id['amount'].')'; + + } + + } + + } + + } if ($bLink) { Index: /mods/wpsg_mod_rechnungen.class.php =================================================================== --- /mods/wpsg_mod_rechnungen.class.php (revision 8007) +++ /mods/wpsg_mod_rechnungen.class.php (revision 8010) @@ -1091,4 +1091,19 @@ } + if (!$bPreview) { + + $oInvoice = \wpsg\wpsg_invoice::getInstance($gnr_id); + + $oInvoice->setMeta('basket_data', json_encode($this->shop->view['basket'])); + $oInvoice->setMeta('version', '2'); + + if (($_REQUEST['storno_shippay']??'0') === '1') { + + $oInvoice->setMeta('include_shipping', '1'); + + } + + } + if (($_REQUEST['storno_shippay']??'0') === '1') { @@ -1107,4 +1122,19 @@ public function writeRechnung($order_id, $preview, $bOutput = true) { + + $bOK = false; + + // PrÃŒfen das Produkte gesetzt sind + foreach ($_REQUEST['invoice_products']??[] as $order_product_id => $order_product_info) { + + if ($order_product_info['set'] === '1') { + + $bOK = true; + + } + + } + + if (!$bOK) throw new \Exception(__('Kein Produkt ausgewÀhlt!', 'wpsg')); $this->shop->view['output'] = $bOutput; @@ -1309,5 +1339,7 @@ $oInvoice = \wpsg\wpsg_invoice::getInstance($r_id); + $oInvoice->setMeta('basket_data', json_encode($this->shop->view['basket'])); + $oInvoice->setMeta('version', '2'); if (($_REQUEST['wpsg_rechnungen_shippay']??'0') === '1') { @@ -1421,4 +1453,19 @@ public function stornoAction() { + $bOK = false; + + // PrÃŒfen das Produkte gesetzt sind + foreach ($_REQUEST['storno_products']??[] as $order_product_id => $order_product_info) { + + if ($order_product_info['set'] === '1') { + + $bOK = true; + + } + + } + + if (!$bOK) throw new \Exception(__('Kein Produkt ausgewÀhlt!', 'wpsg')); + $order_id = intval($_REQUEST['edit_id']); $order_data = $this->shop->cache->loadOrder($order_id); @@ -1464,5 +1511,5 @@ "storno_fee" => wpsg_q($storno_fee) )); - + $this->shop->update_option("wpsg_gutschrift_start", ($gnr_nr + 1)); @@ -1498,6 +1545,8 @@ $file = $this->copyTemp($file, $gnr); + $to = $_REQUEST['storno_mail']; + $arFiles = array($file); - $this->shop->sendMail($mail_text, $this->shop->view['kunde']['email'], 'accountingmail', $arFiles, false, false, $mail_html); + $this->shop->sendMail($mail_text, $to, 'accountingmail', $arFiles, false, false, $mail_html); // TemporÀre Rechnung löschen @@ -1508,6 +1557,5 @@ $this->shop->restoreTempLocale(); - if ($bPreview) $subject = wpsg_translate(__('Rechnungskorrekturmail an #1# (Vorschau)', 'wpsg'), $this->shop->view['kunde']['email']); - else { + if (!$bPreview) { $subject = wpsg_translate(__('Rechnungskorrekturmail an #1#', 'wpsg'), $this->shop->view['kunde']['email']); @@ -1543,5 +1591,5 @@ * @param wpsg_order_product $oOrderProduct */ - private function getAmountToStorno($oOrderProduct) { + public function getAmountToStorno($oOrderProduct) { $invoice_data = json_decode($oOrderProduct->getMeta('wpsg_mod_rechnungen_data', false, 'null'), true); @@ -1634,5 +1682,5 @@ * @param wpsg_order_product $oOrderProduct */ - private function getAmountToInvoice($oOrderProduct) { + public function getAmountToInvoice($oOrderProduct) { $invoice_data = json_decode($oOrderProduct->getMeta('wpsg_mod_rechnungen_data', false, 'null'), true); @@ -2073,4 +2121,19 @@ $customer_data = $this->shop->cache->loadKunden($order_data['k_id']); + $oOrder = wpsg_order::getInstance($order_id); + + $_REQUEST['invoice_products'] = []; + $_REQUEST['wpsg_rechnungen_datum'] = date('Y-m-d'); + + // Komplettauswahl simulieren + foreach ($oOrder->getOrderProducts() as $oOrderProduct) { + + $_REQUEST['invoice_products'][$oOrderProduct->getId()] = [ + 'set' => '1', + 'amount' => $oOrderProduct->getAmount() + ]; + + } + $_REQUEST['wpsg_rechnungen_sendmail'] = '1'; //$_REQUEST['wpsg_rechnungen_email'] = wpsg_q($customer_data['email']); @@ -2078,5 +2141,4 @@ $_REQUEST['wpsg_rechnungen_fusstext'] = ''; $_REQUEST['wpsg_rechnungen_faelligkeit'] = '0'; - $_REQUEST['wpsg_rechnungen_datum'] = date('d.m.Y'); $_REQUEST['wpsg_rechnungen_status'] = '1'; $_REQUEST['wpsg_rechnungen_status_neu'] = '110'; Index: /views/js/admin.js =================================================================== --- /views/js/admin.js (revision 8007) +++ /views/js/admin.js (revision 8010) @@ -109,4 +109,6 @@ var aktTab = 1; + + if (options.aktTab) aktTab = options.aktTab; if (jQuery.cookie(options['cookiename']) != null && jQuery.cookie(options['cookiename']) > 0) Index: /views/mods/mod_rechnungen/order_view.phtml =================================================================== --- /views/mods/mod_rechnungen/order_view.phtml (revision 8007) +++ /views/mods/mod_rechnungen/order_view.phtml (revision 8010) @@ -6,304 +6,52 @@ ?> - - - - - - view['mod_rechnungen']['arRechnungen']) == 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_storno']) == 0) { ?> + +
+ + + + view['mod_rechnungen']['arRechnungen']) == 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_storno']) == 0) { ?> +

- - - view['mod_rechnungen']['arRechnungen_gesamt'] as $r) { ?> - - - - - -
# - - - - - - - - - - - - - - callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'], true)).'R'.$r['rnr'].'.pdf'; - } - else if ($r['gnr'] != "") - { - $rfile = $this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($this->view['data']['id'], true)).'G'.$r['gnr'].'.pdf'; - } - + + + +
+ + view['mod_rechnungen']['arRechnungen_gesamt'] as $r) { + + $oInvoice = \wpsg\wpsg_invoice::getInstance($r['id']); + ?> - -   - - -
-
- - - view['mod_rechnungen']['arRechnungen']) > 0 && sizeof($this->view['mod_rechnungen']['arRechnungen_gesamt']) != sizeof($this->view['mod_rechnungen']['arRechnungen_storno'])) { ?> -
- -
-
- - view['data']['id']); ?> - - - -
-
-
- -
-
- - -
- - -
- -
- - view['data']['id']); ?> - - - - - -
- - - get_option("wpsg_rechnungen_faelligkeit") * 86400)); ?>" /> -
- - - -
- - -
- - - " /> -
- - - - get_option("wpsg_rechnungen_footer"); - - if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = unserialize($this->get_option("wpsg_rechnungen_footer")); - if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = Array(); - - $default = $this->get_option('wpsg_rechnungen_foottext_standard'); - - ?> - - 0) { ?> - - - -
-
-
- - - - " /> - " /> - -
- -
-
-
- - - - + + + + + +
+ + Index: /views/mods/mod_rechnungen/order_view_orderdata_after.phtml =================================================================== --- /views/mods/mod_rechnungen/order_view_orderdata_after.phtml (revision 8007) +++ /views/mods/mod_rechnungen/order_view_orderdata_after.phtml (revision 8010) @@ -24,4 +24,33 @@ $default = $this->get_option('wpsg_rechnungen_foottext_standard'); + /** @var \wpsg\wpsg_invoice[] $arInvoice */ + $arInvoice = $this->callMod('wpsg_mod_rechnungen', 'getInvoiceToOrder', [$oOrder->getId()]); + + $bCanInvoice = false; + $bCanStorno = false; + + foreach ($oOrder->getOrderProducts() as $oOrderProduct) { + + if ($this->callMod('wpsg_mod_rechnungen', 'getAmountToInvoice', [$oOrderProduct]) > 0) { + + $bCanInvoice = true; + + } + + if ($this->callMod('wpsg_mod_rechnungen', 'getAmountToStorno', [$oOrderProduct]) > 0) { + + $bCanStorno = true; + + } + + if ($bCanInvoice && $bCanStorno) break; + + } + + $act = 0; + + if ($bCanInvoice) $act = 1; + else if ($bCanStorno) $act = 2; + ?> @@ -30,181 +59,223 @@
-
- -
- echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=ajax&mod=wpsg_mod_rechnungen&cmd=rechnung&noheader=1&edit_id='.$oOrder->getId(); + + + view['data']['id']); + + $arInvoiceLabel = []; + + foreach ($arInvoice as $oInvoice) { + + if ($oInvoice->isInvoice() && $oInvoice->getMeta('include_shipping', false, '0') === '1') { + + $arInvoiceLabel[] = $oInvoice->getNr(true); + + } + + } + + ?> + + + + + + + + + + + + + + + + /> + + + + + + + + + + + + + 0) { ?> + + + + + + + + + + + + + + + + + + + +
- ?>" class="grid"> +
+ + + +
- view['data']['id']); ?> +
+ + view['data']['id']); + + $arInvoiceLabel = []; + + foreach ($arInvoice as $oInvoice) { + + if ($oInvoice->isStorno() && $oInvoice->getMeta('include_shipping', false, '0') === '1') { + + $arInvoiceLabel[] = $oInvoice->getNr(true); + + } + + } + + ?> + + + + + + + + /> + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - 0) { ?> - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- - view['data']['id']); ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
+
+ @@ -231,5 +302,10 @@ .link_invoice { transform:translateX(-5px); padding:2px 5px; font-siz:12px; text-decoration:underline; } - label[for="invoice_shippay"] .link_invoice { padding:0; } + label[for="invoice_shippay"] .link_invoice, + label[for="storno_shippay"] .link_invoice { padding:0; } + + .wpsg_mod_rechnungen_row { display:block; width:100%; padding:5px; } + .wpsg_mod_rechnungen_row .invoice_wrap:not(:only-child) { margin-top:0.5rem; } + .wpsg_mod_rechnungen_row .invoice_wrap > a:first-child { padding-left:0; } @@ -238,5 +314,5 @@ jQuery('#wpsg_mod_invoice_tabs').wpsg_tab( { - + aktTab: } ); Index: /views/mods/mod_rechnungen/order_view_row.phtml =================================================================== --- /views/mods/mod_rechnungen/order_view_row.phtml (revision 8007) +++ /views/mods/mod_rechnungen/order_view_row.phtml (revision 8010) @@ -13,13 +13,27 @@ $p = $this->view['wpsg_mod_rechnungen']['product']; $product_index = $this->view['wpsg_mod_rechnungen']['product']['product_index']; - + + /** @var \wpsg\wpsg_invoice[] $arInvoice */ + $arInvoice = $this->callMod('wpsg_mod_rechnungen', 'getInvoiceToOrderProduct', [$oOrderProduct]); + $arInvoiceInvoice = []; + $arInvoiceStorno = []; + + foreach ($arInvoice as $oInvoice) { + + if ($oInvoice->isStorno()) $arInvoiceStorno[] = $oInvoice; + else if ($oInvoice->isInvoice()) $arInvoiceInvoice[] = $oInvoice; + + } + ?> -
- + + +
- callMod('wpsg_mod_rechnungen', 'getInvoiceToOrderProduct', [$oOrderProduct]); ?> - 0) { ?> -
- - getNr(true); ?> + 0) { ?> +
+ : + + getNr(true, $oOrderProduct); ?> + +
-
- + + +