Merge branch 'develop' of https://github.com/Karaka-Management/oms-Finance into develop

.github/user_bug_report.md

@@ -8,9 +8,11 @@ assignees: ''
 ---
 
 # Bug Description
+
 A clear and concise description of what the bug is.
 
 # How to Reproduce
+
 Steps to reproduce the behavior:
 
 1. Go to '...'
@@ -19,16 +21,20 @@ Steps to reproduce the behavior:
 4. See error
 
 # Expected Behavior
+
 A clear and concise description of what you expected to happen.
 
 # Screenshots
+
 If applicable, add screenshots to help explain your problem.
 
 # System Information
- - System: [e.g. PC or iPhone11, ...]
+
- - OS: [e.g. iOS]
+- System: [e.g. PC or iPhone11, ...]
- - Browser [e.g. chrome, safari]
+- OS: [e.g. iOS]
- - KarakaVersion [e.g. 22]
+- Browser [e.g. chrome, safari]
+- KarakaVersion [e.g. 22]
 
 # Additional Information
+
 Add any other context about the problem here.

.github/user_feature_request.md

@@ -8,11 +8,14 @@ assignees: ''
 ---
 
 # What is the feature you request
+
 * A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 * A clear and concise description of what you want to happen.
 
 # Alternatives
+
 A clear and concise description of any alternative solutions or features you've considered.
 
 # Additional Information
+
 Add any other context or screenshots about the feature request here.

Controller/ApiController.php

@@ -46,8 +46,8 @@ final class ApiController extends Controller
     private function validateTaxCodeCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['abbr'] = empty($request->getData('abbr')))
+        if (($val['abbr'] = !$request->hasData('abbr'))
-            || ($val['title'] = empty($request->getData('title')))
+            || ($val['title'] = !$request->hasData('title'))
         ) {
             return $val;
         }
@@ -100,7 +100,7 @@ final class ApiController extends Controller
         $code->percentageSales   = $request->getDataInt('percentage_sales_tax') ?? 0;
         $code->percentageInput   = $request->getDataInt('percentage_input_tax') ?? 0;
 
-        if (!empty($request->getData('title'))) {
+        if ($request->hasData('title')) {
             $code->l11n->title = (string) ($request->getData('title'));
             $code->l11n->short = $request->getDataString('short') ?? '';
             $code->l11n->long  = $request->getDataString('long') ?? '';
@@ -122,8 +122,8 @@ final class ApiController extends Controller
     private function validateTaxCodeL11nCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['title'] = empty($request->getData('title')))
+        if (($val['title'] = !$request->hasData('title'))
-            || ($val['code'] = empty($request->getData('code')))
+            || ($val['code'] = !$request->hasData('code'))
         ) {
             return $val;
         }

Models/TaxCodeL11nMapper.php

@@ -23,6 +23,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of BaseStringL11n
+ * @extends DataMapperFactory<T>
  */
 final class TaxCodeL11nMapper extends DataMapperFactory
 {

Models/TaxCodeMapper.php

@@ -23,6 +23,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of TaxCode
+ * @extends DataMapperFactory<T>
  */
 final class TaxCodeMapper extends DataMapperFactory
 {

Theme/Backend/sales-analysis-dashboard.tpl.php

@@ -223,7 +223,7 @@ echo $this->getData('nav')->render();
                             ?>
                                 <tr>
                                     <td><?= $values['month'] . '/' . \substr((string) $values['year'], -2); ?>
-                                    <td><?= (new Money(((int) $values['net_sales']) / 1000))->getCurrency(); ?>
+                                    <td><?= (new Money(((int) $values['net_sales']) / 10000))->getCurrency(); ?>
                                     <td><?= ((int) $values['customers']); ?>
                             <?php endforeach; ?>
                                 <tr>
@@ -343,7 +343,7 @@ echo $this->getData('nav')->render();
                             ?>
                                 <tr>
                                     <td><?= (string) $values['year']; ?>
-                                    <td><?= (new Money(((int) $values['net_sales']) / 1000))->getCurrency(); ?>
+                                    <td><?= (new Money(((int) $values['net_sales']) / 10000))->getCurrency(); ?>
                                     <td><?= ((int) $values['customers']); ?>
                             <?php endforeach; ?>
                     </table>