Merge pull request #28 from maximehuran/feature/fixes

Fix shipping amount and add quantities

Author: lanfisis

src/Repository/AbstractReportRepository.php

@@ -161,12 +161,13 @@ protected function getSelectColumns(bool $isItemUnit = false, bool $isItem = fal
             $isItemUnit ? 'item.unitPrice - (CASE WHEN tax_adjustment.neutral = 1 THEN tax_adjustment.amount ELSE 0 END) as without_tax' : '0 as without_tax',
             // Only retrieve without_tax price for item units
             '(COALESCE(order_promotion_adjustment.amount, 0) + COALESCE(order_item_promotion_adjustment.amount, 0) + COALESCE(order_shipping_promotion_adjustment.amount, 0) + COALESCE(order_unit_promotion_adjustment.amount, 0)) AS without_tax_promo',
-            'shipping_adjustment.amount as without_tax_shipping',
+            'shipping_adjustment.amount - (CASE WHEN shipping_tax_adjustment.neutral = 1 AND shipping_tax_adjustment.shipment IS NOT NULL THEN shipping_tax_adjustment.amount ELSE 0 END) as without_tax_shipping',
             'tax_adjustment.amount as tax',
 
             // Totals
             $isOrder ? 'o.total as total' : '0 as total',
             $isItem ? 'element.total as item_row' : '0 as item_row',
+            $isItem ? 'element.quantity as item_qty' : '0 as item_qty',
         ]);
     }
 
@@ -188,7 +189,8 @@ protected function appendAdjustmentsAndParameters(
 
         return $queryBuilder
             // Adjustments joins
-            ->leftJoin($elementAlias . '.adjustments', 'tax_adjustment', 'WITH', 'tax_adjustment.type = :tax_type')
+            ->leftJoin($elementAlias . '.adjustments', 'tax_adjustment', 'WITH', 'tax_adjustment.type = :tax_type AND tax_adjustment.shipment IS NULL')
+            ->leftJoin($elementAlias . '.adjustments', 'shipping_tax_adjustment', 'WITH', 'shipping_tax_adjustment.type = :tax_type AND shipping_tax_adjustment.shipment IS NOT NULL')
             ->leftJoin(
                 $elementAlias . '.adjustments',
                 'shipping_adjustment',
@@ -320,6 +322,7 @@ protected function initResult(): void
             'tax_total' => 0,
             'total' => 0,
             'item_row_total' => 0,
+            'item_qty_total' => 0,
         ];
         $this->elements = [];
     }

src/Resources/translations/messages.en.yml

@@ -9,12 +9,14 @@ monsieurbiz:
             period_report_for: 'Period report from %from% to %to% for %channel%'
             global_report: 'Global report'
             average_report: 'Average report'
-            number_of_orders: 'Number of orders :'
+            number_of_orders: 'Number of orders:'
+            quantity: 'Items total quantity: '
             product_report: 'Product report'
             product_variant_report: 'Product variant report'
             option_report: 'Option report'
             option_value_report: 'Option value report'
             statistics: 'Statistics'
+            warning_options: 'Warning, a product with several options is counted as many times as options'
         form:
             channel:
                 label: 'Channel'
@@ -31,6 +33,8 @@ monsieurbiz:
             tax_amount: 'Tax amount'
             total_amount: 'Total amount with tax'
             number_of_orders: 'Number of orders'
+            quantity: 'Quantity'
+            average_quantity: 'Average quantity'
             product_name: 'Product name'
             product_variant_name: 'Product variant name'
             no_result: 'No result'

src/Resources/translations/messages.fr.yml

@@ -10,11 +10,13 @@ monsieurbiz:
             global_report: 'Synthèse globale'
             average_report: 'Synthèse moyenne'
             number_of_orders: 'Nombre de commandes :'
+            quantity: 'Quantité d''articles :'
             product_report: 'Synthèse par produit'
             product_variant_report: 'Synthèse par variante produit'
             option_report: 'Synthèse par option'
             option_value_report: 'Synthèse par valeur d''option'
             statistics: 'Statistiques'
+            warning_options: 'Attention, un produit avec plusieurs options est comptabilisé autant de fois que d''options'
         form:
             channel:
                 label: 'Canal'
@@ -31,6 +33,8 @@ monsieurbiz:
             tax_amount: 'Montant TVA'
             total_amount: 'Montant TTC'
             number_of_orders: 'Nombre de commandes'
+            quantity: 'Quantité'
+            average_quantity: 'Quantité moyenne'
             product_name: 'Nom du produit'
             product_variant_name: 'Nom du variant produit'
             no_result: 'Pas de résultat'

src/Resources/translations/messages.nl.yml

@@ -10,11 +10,13 @@ monsieurbiz:
             global_report: 'Algemene rapportage'
             average_report: 'Gemiddelde rapportage'
             number_of_orders: 'Aantal bestellingen:'
+            quantity: 'Totaal aantal artikelen:'
             product_report: 'Product rapportage'
             product_variant_report: 'Product varianten rapportage'
             option_report: 'Opties rapportage'
             option_value_report: 'Optiewaardes rapportage'
             statistics: 'Statistieken'
+            warning_options: 'Waarschu wing, een product met meerdere opties wordt geteld zoveel keer als opties'
         form:
             channel:
                 label: 'Kanaal'
@@ -31,6 +33,8 @@ monsieurbiz:
             tax_amount: 'Tax amount'
             total_amount: 'Totaal aantallen met belasting'
             number_of_orders: 'Aantal bestellingen'
+            quantity: 'Aantal'
+            average_quantity: 'Gemiddelde aantal'
             product_name: 'Product naam'
             product_variant_name: 'Product variant naam'
             no_result: 'Geen resultaat'

src/Resources/views/Admin/Report/_average.html.twig

@@ -4,10 +4,14 @@
 <p>
     {{ 'monsieurbiz.sales_reports.ui.number_of_orders'|trans }}
     <b>{{ average_sales_result.number_of_elements }}</b>
+    -
+    {{ 'monsieurbiz.sales_reports.ui.quantity'|trans }}
+    <b>{{ average_sales_result.item_qty_total }}</b>
 </p>
 <table class="ui celled table">
     <thead>
     <tr>
+        <th>{{ 'monsieurbiz.sales_reports.view.average_quantity' | trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.amount_without_tax' | trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.promo_amount_without_tax' | trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.shipping_amount_without_tax' | trans }}</th>
@@ -17,6 +21,7 @@
     </thead>
     <tbody>
     <tr>
+        <td>{{ (average_sales_result.item_qty_total / average_sales_result.number_of_elements)|round(2, 'floor')  }}</td>
         <td>{{ money.format(average_sales_result.without_tax_total, channel.baseCurrency.code) }}</td>
         <td>{{ money.format(average_sales_result.without_tax_promo_total, channel.baseCurrency.code) }}</td>
         <td>{{ money.format(average_sales_result.without_tax_shipping_total, channel.baseCurrency.code) }}</td>

src/Resources/views/Admin/Report/_option.html.twig

@@ -6,13 +6,20 @@
 {% set without_tax_shipping_total_sum = 0 %}
 {% set tax_total_sum = 0 %}
 {% set item_row_total_sum = 0 %}
+{% set item_qty_total_sum = 0 %}
 
 <h3>{{ 'monsieurbiz.sales_reports.ui.option_report'|trans }}</h3>
+
+<div class="ui info message">
+    <p>{{ 'monsieurbiz.sales_reports.ui.warning_options'|trans }}</p>
+</div>
+
 <table class="ui celled table sortable">
     <thead>
     <tr>
         <th>{{ 'monsieurbiz.sales_reports.view.option_name'|trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.number_of_orders'|trans }}</th>
+        <th>{{ 'monsieurbiz.sales_reports.view.quantity'|trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.amount_without_tax' | trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.promo_amount_without_tax' | trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.tax_amount' | trans }}</th>
@@ -28,9 +35,11 @@
             {% set without_tax_shipping_total_sum = without_tax_shipping_total_sum + result.without_tax_shipping_total %}
             {% set tax_total_sum = tax_total_sum + result.tax_total %}
             {% set item_row_total_sum = item_row_total_sum + result.item_row_total %}
+            {% set item_qty_total_sum = item_qty_total_sum + result.item_qty_total %}
             <tr>
                 <td>{{ result.option_label }}</td>
                 <td>{{ result.number_of_elements }}</td>
+                <td>{{ result.item_qty_total }}</td>
                 <td>{{ money.format(result.without_tax_total, channel.baseCurrency.code) }}</td>
                 <td>{{ money.format(result.without_tax_promo_total, channel.baseCurrency.code) }}</td>
                 <td>{{ money.format(result.tax_total, channel.baseCurrency.code) }}</td>
@@ -48,6 +57,7 @@
             <tr>
                 <th>{{ 'monsieurbiz.sales_reports.view.total'|trans }}</th>
                 <th>{{ number_of_elements_sum }}</th>
+                <th>{{ item_qty_total_sum }}</th>
                 <th>{{ money.format(without_tax_total_sum, channel.baseCurrency.code) }}</th>
                 <th>{{ money.format(without_tax_promo_total_sum, channel.baseCurrency.code) }}</th>
                 <th>{{ money.format(tax_total_sum, channel.baseCurrency.code) }}</th>

src/Resources/views/Admin/Report/_optionValue.html.twig

@@ -6,14 +6,21 @@
 {% set without_tax_shipping_total_sum = 0 %}
 {% set tax_total_sum = 0 %}
 {% set item_row_total_sum = 0 %}
+{% set item_qty_total_sum = 0 %}
 
 <h3>{{ 'monsieurbiz.sales_reports.ui.option_value_report'|trans }}</h3>
+
+<div class="ui info message">
+    <p>{{ 'monsieurbiz.sales_reports.ui.warning_options'|trans }}</p>
+</div>
+
 <table class="ui celled table sortable">
     <thead>
     <tr>
         <th>{{ 'monsieurbiz.sales_reports.view.option_name'|trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.option_value'|trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.number_of_orders'|trans }}</th>
+        <th>{{ 'monsieurbiz.sales_reports.view.quantity'|trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.amount_without_tax' | trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.promo_amount_without_tax' | trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.tax_amount' | trans }}</th>
@@ -29,10 +36,12 @@
             {% set without_tax_shipping_total_sum = without_tax_shipping_total_sum + result.without_tax_shipping_total %}
             {% set tax_total_sum = tax_total_sum + result.tax_total %}
             {% set item_row_total_sum = item_row_total_sum + result.item_row_total %}
+            {% set item_qty_total_sum = item_qty_total_sum + result.item_qty_total %}
             <tr>
                 <td>{{ result.option_label }}</td>
                 <td>{{ result.option_value_label }}</td>
                 <td>{{ result.number_of_elements }}</td>
+                <td>{{ result.item_qty_total }}</td>
                 <td>{{ money.format(result.without_tax_total, channel.baseCurrency.code) }}</td>
                 <td>{{ money.format(result.without_tax_promo_total, channel.baseCurrency.code) }}</td>
                 <td>{{ money.format(result.tax_total, channel.baseCurrency.code) }}</td>
@@ -50,6 +59,7 @@
             <tr>
                 <th colspan="2">{{ 'monsieurbiz.sales_reports.view.total'|trans }}</th>
                 <th>{{ number_of_elements_sum }}</th>
+                <th>{{ item_qty_total_sum }}</th>
                 <th>{{ money.format(without_tax_total_sum, channel.baseCurrency.code) }}</th>
                 <th>{{ money.format(without_tax_promo_total_sum, channel.baseCurrency.code) }}</th>
                 <th>{{ money.format(tax_total_sum, channel.baseCurrency.code) }}</th>

src/Resources/views/Admin/Report/_product.html.twig

@@ -6,13 +6,15 @@
 {% set without_tax_shipping_total_sum = 0 %}
 {% set tax_total_sum = 0 %}
 {% set item_row_total_sum = 0 %}
+{% set item_qty_total_sum = 0 %}
 
 <h3>{{ 'monsieurbiz.sales_reports.ui.product_report'|trans }}</h3>
 <table class="ui celled table sortable">
     <thead>
     <tr>
         <th>{{ 'monsieurbiz.sales_reports.view.product_name'|trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.number_of_orders'|trans }}</th>
+        <th>{{ 'monsieurbiz.sales_reports.view.quantity'|trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.amount_without_tax' | trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.promo_amount_without_tax' | trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.tax_amount' | trans }}</th>
@@ -28,9 +30,11 @@
             {% set without_tax_shipping_total_sum = without_tax_shipping_total_sum + result.without_tax_shipping_total %}
             {% set tax_total_sum = tax_total_sum + result.tax_total %}
             {% set item_row_total_sum = item_row_total_sum + result.item_row_total %}
+            {% set item_qty_total_sum = item_qty_total_sum + result.item_qty_total %}
             <tr>
                 <td>{{ result.product_name }}</td>
                 <td>{{ result.number_of_elements }}</td>
+                <td>{{ result.item_qty_total }}</td>
                 <td>{{ money.format(result.without_tax_total, channel.baseCurrency.code) }}</td>
                 <td>{{ money.format(result.without_tax_promo_total, channel.baseCurrency.code) }}</td>
                 <td>{{ money.format(result.tax_total, channel.baseCurrency.code) }}</td>
@@ -48,6 +52,7 @@
             <tr>
                 <th>{{ 'monsieurbiz.sales_reports.view.total'|trans }}</th>
                 <th>{{ number_of_elements_sum }}</th>
+                <th>{{ item_qty_total_sum }}</th>
                 <th>{{ money.format(without_tax_total_sum, channel.baseCurrency.code) }}</th>
                 <th>{{ money.format(without_tax_promo_total_sum, channel.baseCurrency.code) }}</th>
                 <th>{{ money.format(tax_total_sum, channel.baseCurrency.code) }}</th>

src/Resources/views/Admin/Report/_productVariant.html.twig

@@ -6,13 +6,15 @@
 {% set without_tax_shipping_total_sum = 0 %}
 {% set tax_total_sum = 0 %}
 {% set item_row_total_sum = 0 %}
+{% set item_qty_total_sum = 0 %}
 
 <h3>{{ 'monsieurbiz.sales_reports.ui.product_variant_report'|trans }}</h3>
 <table class="ui celled table sortable">
     <thead>
     <tr>
         <th>{{ 'monsieurbiz.sales_reports.view.product_variant_name'|trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.number_of_orders'|trans }}</th>
+        <th>{{ 'monsieurbiz.sales_reports.view.quantity'|trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.amount_without_tax' | trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.promo_amount_without_tax' | trans }}</th>
         <th>{{ 'monsieurbiz.sales_reports.view.tax_amount' | trans }}</th>
@@ -28,9 +30,11 @@
             {% set without_tax_shipping_total_sum = without_tax_shipping_total_sum + result.without_tax_shipping_total %}
             {% set tax_total_sum = tax_total_sum + result.tax_total %}
             {% set item_row_total_sum = item_row_total_sum + result.item_row_total %}
+            {% set item_qty_total_sum = item_qty_total_sum + result.item_qty_total %}
             <tr>
                 <td>{{ result.variant_name }}</td>
                 <td>{{ result.number_of_elements }}</td>
+                <td>{{ result.item_qty_total }}</td>
                 <td>{{ money.format(result.without_tax_total, channel.baseCurrency.code) }}</td>
                 <td>{{ money.format(result.without_tax_promo_total, channel.baseCurrency.code) }}</td>
                 <td>{{ money.format(result.tax_total, channel.baseCurrency.code) }}</td>
@@ -48,6 +52,7 @@
             <tr>
                 <th>{{ 'monsieurbiz.sales_reports.view.total'|trans }}</th>
                 <th>{{ number_of_elements_sum }}</th>
+                <th>{{ item_qty_total_sum }}</th>
                 <th>{{ money.format(without_tax_total_sum, channel.baseCurrency.code) }}</th>
                 <th>{{ money.format(without_tax_promo_total_sum, channel.baseCurrency.code) }}</th>
                 <th>{{ money.format(tax_total_sum, channel.baseCurrency.code) }}</th>