feat: quiqqer/discount#14 + refactor: code style

ajax/activate.php

@@ -21,6 +21,6 @@ function ($discountId) {
 
         return $Discount->isActive();
     },
-    array('discountId'),
+    ['discountId'],
     'Permission::checkAdminUser'
 );

ajax/create.php

@@ -23,6 +23,6 @@ function ($params) {
 
         return $Discount->getId();
     },
-    array('params'),
+    ['params'],
     'Permission::checkAdminUser'
 );

ajax/deactivate.php

@@ -21,6 +21,6 @@ function ($discountId) {
 
         return $Discount->isActive();
     },
-    array('discountId'),
+    ['discountId'],
     'Permission::checkAdminUser'
 );

ajax/deleteChild.php

@@ -18,6 +18,6 @@ function ($discountId) {
         $Discount  = $Discounts->getChild($discountId);
         $Discount->delete();
     },
-    array('discountId'),
+    ['discountId'],
     'Permission::checkAdminUser'
 );

ajax/deleteChildren.php

@@ -31,6 +31,6 @@ function ($discountIds) {
             throw new $ExceptionStack();
         }
     },
-    array('discountIds'),
+    ['discountIds'],
     'Permission::checkAdminUser'
 );

ajax/get.php

@@ -23,6 +23,6 @@ function ($id) {
 
         return $attributes;
     },
-    array('id'),
+    ['id'],
     'Permission::checkAdminUser'
 );

ajax/search.php

@@ -15,17 +15,17 @@
     'package_quiqqer_discount_ajax_search',
     function ($fields, $params) {
         $Discounts = new QUI\ERP\Discount\Handler();
-        $result    = array();
+        $result    = [];
         $Locale    = QUI::getLocale();
 
         $allowedFields = $Discounts->getChildAttributes();
 
-        $query  = array();
+        $query  = [];
         $params = json_decode($params, true);
         $fields = json_decode($fields, true);
 
         if (!is_array($fields)) {
-            $fields = array();
+            $fields = [];
         }
 
         if (isset($params['order'])) {
@@ -43,24 +43,24 @@ function ($fields, $params) {
                 continue;
             }
 
-            $query['where_or'][$field] = array(
+            $query['where_or'][$field] = [
                 'type'  => '%LIKE%',
                 'value' => $value
-            );
+            ];
         }
 
         // search
         $data = $Discounts->getChildrenData($query);
 
         foreach ($data as $entry) {
-            $entry['title'] = array(
+            $entry['title'] = [
                 'quiqqer/discount',
-                'discount.' . $entry['id'] . '.title'
-            );
+                'discount.'.$entry['id'].'.title'
+            ];
 
             $entry['text'] = $Locale->get(
                 'quiqqer/discount',
-                'discount.' . $entry['id'] . '.title'
+                'discount.'.$entry['id'].'.title'
             );
 
             $result[] = $entry;
@@ -72,6 +72,6 @@ function ($fields, $params) {
 
         return $result;
     },
-    array('fields', 'params'),
+    ['fields', 'params'],
     'Permission::checkAdminUser'
 );

ajax/toggle.php

@@ -26,6 +26,6 @@ function ($discountId) {
 
         return $Discount->isActive();
     },
-    array('discountId'),
+    ['discountId'],
     'Permission::checkAdminUser'
 );

ajax/update.php

@@ -22,6 +22,6 @@ function ($discountId, $params) {
         $Discount->setAttributes($params);
         $Discount->update();
     },
-    array('discountId', 'params'),
+    ['discountId', 'params'],
     'Permission::checkAdminUser'
 );

bin/controls/DiscountEdit.html

@@ -174,6 +174,7 @@
                         <option value="1">{{usageScopeEvery}}</option>
                         <option value="2">{{usageScopeTotal}}</option>
                         <option value="3">{{usageScopeUnique}}</option>
+                        <option value="4">{{usageScopeGrandTotal}}</option>
                     </select>
                 </label>
             </td>

bin/controls/DiscountEdit.js

@@ -77,11 +77,12 @@ define('package/quiqqer/discount/bin/controls/DiscountEdit', [
                 usageLastProductDiscount    : QUILocale.get(lg, 'control.edit.template.usageLastProductDiscount'),
                 usageLastProductDiscountDesc: QUILocale.get(lg, 'control.edit.template.usageLastProductDiscountDesc'),
 
-                usageScope      : QUILocale.get(lg, 'control.edit.template.usageScope'),
-                usageScopeEvery : QUILocale.get(lg, 'control.edit.template.usageScopeEvery'),
-                usageScopeTotal : QUILocale.get(lg, 'control.edit.template.usageScopeTotal'),
-                usageScopeUnique: QUILocale.get(lg, 'control.edit.template.usageScopeUnique'),
-                scopeDescription: QUILocale.get(lg, 'control.edit.template.usage.description'),
+                usageScope          : QUILocale.get(lg, 'control.edit.template.usageScope'),
+                usageScopeEvery     : QUILocale.get(lg, 'control.edit.template.usageScopeEvery'),
+                usageScopeTotal     : QUILocale.get(lg, 'control.edit.template.usageScopeTotal'),
+                usageScopeUnique    : QUILocale.get(lg, 'control.edit.template.usageScopeUnique'),
+                usageScopeGrandTotal: QUILocale.get(lg, 'control.edit.template.usageScopeGrandTotal'),
+                scopeDescription    : QUILocale.get(lg, 'control.edit.template.usage.description'),
 
                 calculationBasis          : QUILocale.get(lg, 'control.edit.template.calculationBasis'),
                 calculationBasisNetto     : QUILocale.get(lg, 'control.edit.template.calculationBasis.netto'),

locale.xml

@@ -245,6 +245,10 @@
             'For each product' and 'On one product (Unique)' is applied to the single price of the product.
             ]]></en>
         </locale>
+        <locale name="control.edit.template.usageScopeGrandTotal">
+            <de><![CDATA[Von Gesamtsumme abziehen]]></de>
+            <en><![CDATA[Deduct from grand total]]></en>
+        </locale>
 
         <locale name="control.edit.template.shopping.amount.of">
             <de><![CDATA[Einkaufsmenge von]]></de>

src/QUI/ERP/Discount/Discount.php

@@ -530,6 +530,10 @@ public function toPriceFactor($Locale = null, $Customer = null)
             $basis = QUI\ERP\Accounting\Calc::CALCULATION_BASIS_VAT_BRUTTO;
         }
 
+        if ($this->getAttribute('scope') === Handler::DISCOUNT_SCOPE_GRAND_TOTAL) {
+            $basis = QUI\ERP\Accounting\Calc::CALCULATION_GRAND_TOTAL;
+        }
+
         try {
             $Plugin = QUI::getPackage('quiqqer/products');
             $Config = $Plugin->getConfig();

src/QUI/ERP/Discount/Handler.php

@@ -41,6 +41,13 @@ class Handler extends QUI\CRUD\Factory
      */
     const DISCOUNT_SCOPE_UNIQUE = 3;
 
+    /**
+     * discount scope -> grand total
+     * - ignoring vat calc
+     * - deduct from grand total
+     */
+    const DISCOUNT_SCOPE_GRAND_TOTAL = 4;
+
     /**
      * pricefactor discount type
      */

src/QUI/ERP/Discount/Utils.php

@@ -22,8 +22,10 @@ class Utils
      *
      * @param \QUI\Interfaces\Users\User $User
      * @return array
+     *
+     * @throws \QUI\Database\Exception
      */
-    public static function getUserDiscounts(UserInterface $User)
+    public static function getUserDiscounts(UserInterface $User): array
     {
         $guString = UserGroups::getUserGroupStringFromUser($User);
         $guString = ','.\str_replace(',', ',|,', $guString).',';
@@ -63,8 +65,10 @@ public static function getUserDiscounts(UserInterface $User)
      *
      * @param Product $Product
      * @return array
+     *
+     * @throws \QUI\Database\Exception
      */
-    public static function getProductDiscounts(Product $Product)
+    public static function getProductDiscounts(Product $Product): array
     {
         $result    = [];
         $Discounts = new Handler();
@@ -101,8 +105,10 @@ public static function getProductDiscounts(Product $Product)
      *
      * @param \QUI\Interfaces\Users\User $User
      * @return array
+     *
+     * @throws \QUI\Database\Exception
      */
-    public static function getActiveUserDiscounts(UserInterface $User)
+    public static function getActiveUserDiscounts(UserInterface $User): array
     {
         $guString = UserGroups::getUserGroupStringFromUser($User);
         $guString = ','.\str_replace(',', ',|,', $guString).',';
@@ -168,8 +174,10 @@ public static function getActiveUserDiscounts(UserInterface $User)
      *
      * @param \QUI\Interfaces\Users\User $User
      * @return array
+     *
+     * @throws \QUI\Database\Exception
      */
-    public static function getUsableUserDiscounts(UserInterface $User)
+    public static function getUsableUserDiscounts(UserInterface $User): array
     {
         $discounts = self::getActiveUserDiscounts($User);
         $result    = [];