test fixes

Admin/Install/types.json

@@ -1,7 +1,7 @@
 [
 	{
 		"name": "sales_offer",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 1,
 		"transferStock": false,
 		"isTemplate": false,
@@ -12,7 +12,7 @@
 	},
 	{
 		"name": "sales_order_confirmation",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 1,
 		"transferStock": false,
 		"isTemplate": false,
@@ -23,7 +23,7 @@
 	},
 	{
 		"name": "sales_delivery_note",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 1,
 		"transferStock": true,
 		"isTemplate": false,
@@ -34,7 +34,7 @@
 	},
 	{
 		"name": "sales_invoice",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 1,
 		"transferStock": false,
 		"isTemplate": false,
@@ -45,7 +45,7 @@
 	},
 	{
 		"name": "sales_proforma_invoice",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 1,
 		"transferStock": false,
 		"isTemplate": false,
@@ -56,7 +56,7 @@
 	},
 	{
 		"name": "sales_credit_note",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 1,
 		"transferStock": false,
 		"isTemplate": false,
@@ -67,7 +67,7 @@
 	},
 	{
 		"name": "sales_reverse_invoice",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 1,
 		"transferStock": false,
 		"isTemplate": false,
@@ -78,7 +78,7 @@
 	},
 	{
 		"name": "purchase_offer",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 2,
 		"transferStock": false,
 		"isTemplate": false,
@@ -89,7 +89,7 @@
 	},
 	{
 		"name": "purchase_order_confirmation",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 2,
 		"transferStock": false,
 		"isTemplate": false,
@@ -100,7 +100,7 @@
 	},
 	{
 		"name": "purchase_delivery_note",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 2,
 		"transferStock": true,
 		"isTemplate": false,
@@ -111,7 +111,7 @@
 	},
 	{
 		"name": "purchase_invoice",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 2,
 		"transferStock": false,
 		"isTemplate": false,
@@ -122,7 +122,7 @@
 	},
 	{
 		"name": "purchase_proforma_invoice",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 2,
 		"transferStock": false,
 		"isTemplate": false,
@@ -133,7 +133,7 @@
 	},
 	{
 		"name": "purchase_credit_note",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 2,
 		"transferStock": false,
 		"isTemplate": false,
@@ -144,7 +144,7 @@
 	},
 	{
 		"name": "purchase_reverse_invoice",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 2,
 		"transferStock": false,
 		"isTemplate": false,
@@ -155,7 +155,7 @@
 	},
 	{
 		"name": "stock_movement",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 4,
 		"transferStock": false,
 		"isTemplate": false,
@@ -166,7 +166,7 @@
 	},
 	{
 		"name": "stock_scrapping",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 4,
 		"transferStock": false,
 		"isTemplate": false,
@@ -177,7 +177,7 @@
 	},
 	{
 		"name": "sales_subscritpion",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 1,
 		"transferStock": false,
 		"isTemplate": false,
@@ -188,7 +188,7 @@
 	},
 	{
 		"name": "sales_template",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 1,
 		"transferStock": false,
 		"isTemplate": true,
@@ -199,7 +199,7 @@
 	},
 	{
 		"name": "purchase_subscritpion",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 2,
 		"transferStock": false,
 		"isTemplate": false,
@@ -210,7 +210,7 @@
 	},
 	{
 		"name": "purchase_template",
-		"numberFormat": "{y}-{id}",
+		"numberFormat": "{y}-{sequence}",
 		"transferType": 2,
 		"transferStock": false,
 		"isTemplate": true,

Controller/ApiBillController.php

@@ -660,8 +660,17 @@ final class ApiBillController extends Controller
         if ($templateId === null) {
             $billTypeId = $request->getData('bill_type', 'int');
 
+            if (empty($billTypeId)) {
+                $billTypeId = $bill->type->getId();
+            }
+
+            if (empty($billTypeId)) {
+                return;
+            }
+
             /** @var \Modules\Billing\Models\BillType $billType */
             $billType = BillTypeMapper::get()
+                ->with('defaultTemplate')
                 ->where('id', $billTypeId)
                 ->execute();
 

Models/BillMapper.php

@@ -26,6 +26,8 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 /**
  * Mapper class.
  *
+ * WARNING: This mapper may use a trigger to update the sequence number on insert.
+ *
  * @package Modules\Billing\Models
  * @license OMS License 2.0
  * @link    https://jingga.app

Models/SalesBillMapper.php

@@ -252,8 +252,11 @@ final class SalesBillMapper extends BillMapper
             $clientIds[] = $client['client'];
         }
 
+        $clients = [];
         if (!empty($clientIds)) {
             $clients = ClientMapper::getAll()
+                ->with('account')
+                ->with('mainAddress')
                 ->where('id', $clientIds, 'IN')
                 ->execute();
         }

Theme/Backend/bill-create.tpl.php

@@ -12,6 +12,7 @@
  */
 declare(strict_types=1);
 
+use Modules\Billing\Models\BillStatus;
 use Modules\Billing\Models\NullBill;
 use phpOMS\Localization\ISO3166NameEnum;
 use phpOMS\Localization\ISO3166TwoEnum;
@@ -304,7 +305,7 @@ echo $this->getData('nav')->render(); ?>
                                         <?php endif; ?>
                                     <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input name="" type="text" value="<?= $element->itemNumber; ?>" required<?= $disabled; ?>></span>
                                     <td><textarea required<?= $disabled; ?>><?= $element->itemName; ?></textarea>
-                                    <td><input name="" type="number" min="0" value="<?= $element->quantity; ?>" required<?= $disabled; ?>>
+                                    <td><input name="" type="number" min="0" value="<?= $element->getQuantity(); ?>" required<?= $disabled; ?>>
                                     <td><input name="" type="text" value="<?= $element->singleSalesPriceNet->getCurrency(symbol: ''); ?>"<?= $disabled; ?>>
                                     <td><input name="" type="number" min="0"<?= $disabled; ?>>
                                     <td><input name="" type="number" min="0" max="100" step="any"<?= $disabled; ?>>

tests/Controller/ApiControllerTest.php

@@ -22,6 +22,7 @@ use phpOMS\Account\PermissionType;
 use phpOMS\Application\ApplicationAbstract;
 use phpOMS\Dispatcher\Dispatcher;
 use phpOMS\Event\EventManager;
+use phpOMS\Localization\L11nManager;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
@@ -63,6 +64,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $this->app->moduleManager  = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/');
         $this->app->dispatcher     = new Dispatcher($this->app);
         $this->app->eventManager   = new EventManager($this->app->dispatcher);
+        $this->app->l11nManager    = new L11nManager();
         $this->app->eventManager->importFromFile(__DIR__ . '/../../../../Web/Api/Hooks.php');
 
         $account = new Account();

tests/Models/BillElementTest.php

@@ -65,8 +65,8 @@ final class BillElementTest extends \PHPUnit\Framework\TestCase
         $this->element->itemNumber      = '123456';
         $this->element->itemName        = 'Test';
         $this->element->itemDescription = 'Description';
-        $this->element->quantity        = 4;
         $this->element->bill            = 5;
+        $this->element->setQuantity(4);
 
         self::assertEquals(
             [