Merge pull request #31 from wuunder/development

Development
wuunder · Oct 2, 2019 · 8d1ce2b · 8d1ce2b
2 parents ef5c7b3 + c16422b
commit 8d1ce2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Fixed
 - Parcelshop locator wuunder production settings
+- Order value
+- Line ending description
 
 
 ## [2.7.4](https://github.com/kabisa/wuunder-webshopplugin-woocommerce/tag/2.7.4) - 2019-09-27

diff --git a/includes/wcwuunder-create.php b/includes/wcwuunder-create.php
@@ -61,7 +61,7 @@ public function wcwp_sample_admin_notice__error() {
          */
         private function wcwp_setBookingConfig($orderId ) {
             wcwp_log( 'info', 'Filling the booking config' );
-            
+
             $orderItems = $this->wcwp_get_order_items( $orderId );
 
             $order = new WC_Order( $orderId );
@@ -101,14 +101,14 @@ private function wcwp_setBookingConfig($orderId ) {
 
             foreach ( $orderItems['products'] as $item ) {
                 $totalWeight += $item['total_weight'];
-                $description .= '- ' . $item['quantity'] . 'x ' . $item['name'] . ' \r\n';
+                $description .= '- ' . $item['quantity'] . 'x ' . $item['name'] . "\r\n";
             }
 
             if ( 3 !== count( $dimensions ) ) {
                 $dimensions = array( null, null, null );
             }
 
-            $value = intval( $order->get_subtotal() * 100 );
+            $value = intval(($order->get_total() + $order->get_total_discount() - $order->get_shipping_total()) * 100);
 
             $bookingToken = uniqid();
             update_post_meta( $orderId, '_wuunder_label_booking_token', $bookingToken );
@@ -447,7 +447,7 @@ public function wcwp_add_listing_actions($order ) {
                     $target = ' target="_blank" ';
                     ?>
                     <a
-                    <?php 
+                    <?php
                     echo $target; ?>href=" <?php echo $data['url']; ?>" class="<?php echo $data['action']; ?> button tips <?php echo $action; ?>" style="background:#8dcc00; height:2em; width:2em; padding:3px;" alt="<?php echo $data['title']; ?>" data-tip="<?php echo $data['title']; ?>">
                     <img src="<?php echo $data['img']; ?>" style="width:18px; margin: 4px 3px;"
                          alt="<?php echo $data['title']; ?>">