Index: /model/wpsg_order.class.php =================================================================== --- /model/wpsg_order.class.php (revision 7348) +++ /model/wpsg_order.class.php (revision 7349) @@ -922,4 +922,23 @@ } // public function getShippingCountryID() + public function createDB() { + + $order_id = $this->id; + + if (!wpsg_isSizedInt($this->id)) { + + $order_id = $this->db->ImportQuery(WPSG_TBL_ORDER, [ + 'cdate' => 'NOW()', + 'status' => wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG) + ]); + + $_SESSION['wpsg']['order_id'] = $order_id; + + } + + return $order_id; + + } + /** * Gibt das Lieferland als Objekt zurÃŒck Index: /mods/wpsg_mod_gutschein.class.php =================================================================== --- /mods/wpsg_mod_gutschein.class.php (revision 7348) +++ /mods/wpsg_mod_gutschein.class.php (revision 7349) @@ -130,5 +130,7 @@ $gs = $_SESSION['wpsg']['gs']; - $oCalculation->addVoucher($gs['value'], $this->shop->getBackendTaxview(), '0', 1,$gs['code'],$gs['id']); + if ($gs['calc'] === 'p') $gs['value'] = $gs['value'].'%'; + + $oCalculation->addVoucher($gs['value'], $this->shop->getBackendTaxview(), '0', 1, $gs['code'], $gs['id']); } Index: /mods/wpsg_mod_kundenkontakt.class.php =================================================================== --- /mods/wpsg_mod_kundenkontakt.class.php (revision 7348) +++ /mods/wpsg_mod_kundenkontakt.class.php (revision 7349) @@ -7,5 +7,7 @@ var $id = 1000; var $hilfeURL = 'http://wpshopgermany.de/?p=3886'; + static $arSMSStatus = []; + static $sms_endpoint = ''; /** Index: /mods/wpsg_mod_paypalapi.class.php =================================================================== --- /mods/wpsg_mod_paypalapi.class.php (revision 7348) +++ /mods/wpsg_mod_paypalapi.class.php (revision 7349) @@ -1094,5 +1094,7 @@ $oOrder = wpsg_order::getInstance($order_id); $access_token = $this->api_getAccessToken(); - + + $order_id = $oOrder->createDB(); + $item_list = array( 'items' => array() Index: /views/css/frontend.css =================================================================== --- /views/css/frontend.css (revision 7348) +++ /views/css/frontend.css (revision 7349) @@ -70,5 +70,5 @@ .basket_sum_wrap .wpsg_mod_basketteaser_row .valuel { width: 20%; display:inline-block; font-weight:normal; text-align:left; } .basket_sum_wrap .wpsg_gutschein_add {padding:0.75em 1em;} -.procent_payship { font-size:0.75em; line-height:0.75em; color:#666666; displaY:block; } +.procent_payship { font-size:0.75em; line-height:0.75em; color:#666666; displaY:block; margin-bottom:10px; } /* .glyphicon {width:20px !important; text-decoration:none; position:relative; display:inline-block; font-family:'Glyphicons Halflings'; line-height:1rem;} */ Index: /views/mods/mod_kundenkontakt/order_view.phtml =================================================================== --- /views/mods/mod_kundenkontakt/order_view.phtml (revision 7348) +++ /views/mods/mod_kundenkontakt/order_view.phtml (revision 7349) @@ -176,79 +176,81 @@ - - -
-
- -
- - - -

Mit diesem Formular kann eine SMS an den Kunden versendet werden.

- -
- -
- view['valid'] === true) { ?> - -
- view['phone']); ?> -
- - - -
- view['phone']); ?> -
- - -
- -
- - view['phone']); ?> - -
- - - - view['valid'] === true)?'':'disabled="disabled"'); ?> value="" class="button" style="float:right; margin-top:15px;" /> - - - -
- + + + + +
- - - + + + Index: /views/order/product_table.phtml =================================================================== --- /views/order/product_table.phtml (revision 7348) +++ /views/order/product_table.phtml (revision 7349) @@ -120,7 +120,15 @@ 1 - - get_option('wpsg_currency'); ?> - + get_option('wpsg_currency'); + + if (strpos($arCalculation['voucher'][0]['set'], '%') !== false) { + + echo '('.wpsg_ff(wpsg_tf($arCalculation['voucher'][0]['set']), '%').')'; + + } + + ?> Index: /views/warenkorb/basket.phtml =================================================================== --- /views/warenkorb/basket.phtml (revision 7348) +++ /views/warenkorb/basket.phtml (revision 7349) @@ -142,30 +142,27 @@ view['basket']['gs'])) { $bLine = true; ?> -
-
+ +
+
+ view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>
-
- - - - -
-
-
-
 
-
1
-
- view['basket']['gs']['calc'] == 'p') { ?> - view['basket']['gs']['value'], '%'); ?> - - view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?> - -
- view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> -
- -
view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
-
+ view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> +
+ +
view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); + + if (strpos($this->view['basket']['arCalculation']['voucher'][0]['set'], '%') !== false) { + + echo '('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['voucher'][0]['set']), '%').')'; + + } + + ?>
+ +
+ Index: /views/warenkorb/overview.phtml =================================================================== --- /views/warenkorb/overview.phtml (revision 7348) +++ /views/warenkorb/overview.phtml (revision 7349) @@ -270,23 +270,19 @@ view['basket']['gs'])) { $bLine = true; ?>
-
+
view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?>
-
-
-
 
-
1
-
- view['basket']['gs']['calc'] == 'p') { ?> - view['basket']['gs']['value'], '%'); ?> - - view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?> - -
- view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> -
- -
view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
-
+
view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); + + if (strpos($this->view['basket']['arCalculation']['voucher'][0]['set'], '%') !== false) { + + echo '('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['voucher'][0]['set']), '%').')'; + + } + + ?>
+