diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 1d210d8..a45b800 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -52,13 +52,13 @@ final class ApiController extends Controller { if (!empty($val = $this->validateSupplierCreate($request))) { $response->set('supplier_create', new FormValidation($val)); - $response->getHeader()->setStatusCode(RequestStatusCode::R_400); + $response->header->status = RequestStatusCode::R_400; return; } $supplier = $this->createSupplierFromRequest($request); - $this->createModel($request->getHeader()->getAccount(), $supplier, SupplierMapper::class, 'supplier', $request->getOrigin()); + $this->createModel($request->header->account, $supplier, SupplierMapper::class, 'supplier', $request->getOrigin()); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Supplier', 'Supplier successfully created', $supplier); } @@ -74,21 +74,21 @@ final class ApiController extends Controller private function createSupplierFromRequest(RequestAbstract $request) : Supplier { $account = new Account(); - $account->setName1($request->getData('name1') ?? ''); - $account->setName2($request->getData('name2') ?? ''); + $account->name1 = $request->getData('name1') ?? ''; + $account->name2 = $request->getData('name2') ?? ''; $profile = new Profile($account); $supplier = new Supplier(); - $supplier->setNumber($request->getData('number') ?? ''); - $supplier->setProfile($profile); + $supplier->number = $request->getData('number') ?? ''; + $supplier->profile = $profile; $addr = new Address(); - $addr->setAddress($request->getData('address') ?? ''); - $addr->setPostal($request->getData('postal') ?? ''); - $addr->setCity($request->getData('city') ?? ''); + $addr->address = $request->getData('address') ?? ''; + $addr->postal = $request->getData('postal') ?? ''; + $addr->city = $request->getData('city') ?? ''; + $addr->state = $request->getData('state') ?? ''; $addr->setCountry($request->getData('country') ?? ''); - $addr->setState($request->getData('state') ?? ''); $supplier->setMainAddress($addr); return $supplier; @@ -134,16 +134,16 @@ final class ApiController extends Controller if (!empty($val = $profileModule->validateContactElementCreate($request))) { $response->set('contact_element_create', new FormValidation($val)); - $response->getHeader()->setStatusCode(RequestStatusCode::R_400); + $response->header->status = RequestStatusCode::R_400; return; } $contactElement = $profileModule->createContactElementFromRequest($request); - $this->createModel($request->getHeader()->getAccount(), $contactElement, ContactElementMapper::class, 'supplier-contactElement', $request->getOrigin()); + $this->createModel($request->header->account, $contactElement, ContactElementMapper::class, 'supplier-contactElement', $request->getOrigin()); $this->createModelRelation( - $request->getHeader()->getAccount(), + $request->header->account, (int) $request->getData('supplier'), $contactElement->getId(), SupplierMapper::class, 'contactElements', '', $request->getOrigin()); diff --git a/Controller/BackendController.php b/Controller/BackendController.php index dc1536f..12058d7 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -98,4 +98,23 @@ final class BackendController extends Controller return $view; } + + /** + * Routing end-point for application behaviour. + * + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + * @codeCoverageIgnore + */ + public function viewSupplierManagementSupplierAnalysis(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + { + $view = new View($this->app->l11nManager, $request, $response); + + return $view; + } } diff --git a/Models/Supplier.php b/Models/Supplier.php index 2bca416..72516ca 100644 --- a/Models/Supplier.php +++ b/Models/Supplier.php @@ -39,7 +39,7 @@ class Supplier */ protected int $id = 0; - private string $number = ''; + public string $number = ''; private string $numberReverse = ''; @@ -53,7 +53,7 @@ class Supplier private $createdAt = null; - private $profile = null; + public $profile = null; private $files = []; @@ -87,32 +87,6 @@ class Supplier return $this->id; } - /** - * Get number. - * - * @return string - * - * @since 1.0.0 - */ - public function getNumber() : string - { - return $this->number; - } - - /** - * Set number. - * - * @param string $number Number - * - * @return void - * - * @since 1.0.0 - */ - public function setNumber(string $number) : void - { - $this->number = $number; - } - /** * Get reverse number. * @@ -247,44 +221,6 @@ class Supplier $this->info = $info; } - /** - * Get created at date time - * - * @return \DateTimeImmutable - * - * @since 1.0.0 - */ - public function getCreatedAt() : \DateTimeImmutable - { - return $this->createdAt; - } - - /** - * Get profile. - * - * @return Profile - * - * @since 1.0.0 - */ - public function getProfile() : Profile - { - return $this->profile; - } - - /** - * Set profile. - * - * @param Profile $profile Profile - * - * @return void - * - * @since 1.0.0 - */ - public function setProfile(Profile $profile) : void - { - $this->profile = $profile; - } - /** * Set main address * diff --git a/Theme/Backend/supplier-create.tpl.php b/Theme/Backend/supplier-create.tpl.php index c93ee34..75aeee4 100644 --- a/Theme/Backend/supplier-create.tpl.php +++ b/Theme/Backend/supplier-create.tpl.php @@ -30,7 +30,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>

getHtml('Supplier'); ?>

@@ -51,7 +51,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-2' ? ' checked' : ''; ?>>

getHtml('Contact'); ?>

@@ -82,7 +82,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-3' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-3' ? ' checked' : ''; ?>>

getHtml('Address'); ?>

@@ -110,7 +110,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-4' ? ' checked' : ''; ?>>

getHtml('PaymentTerm'); ?>

@@ -138,7 +138,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>

getHtml('Payment'); ?>

@@ -156,10 +156,10 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-6' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-6' ? ' checked' : ''; ?>>
- request->getUri()->getFragment() === 'c-tab-7' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-7' ? ' checked' : ''; ?>>
l11nManager, $this->request, $this->response); @@ -183,8 +183,8 @@ echo $this->getData('nav')->render(); ?> printHtml($this->request->getOrigin()); ?> - printHtml($this->request->getHeader()->getAccount()); ?> - printHtml($this->request->getHeader()->getAccount()); ?> + printHtml($this->request->header->account); ?> + printHtml($this->request->header->account); ?> Creating suppier printHtml((new \DateTime('now'))->format('Y-m-d H:i:s')); ?> diff --git a/Theme/Backend/supplier-list.tpl.php b/Theme/Backend/supplier-list.tpl.php index 5708253..b36d6dd 100644 --- a/Theme/Backend/supplier-list.tpl.php +++ b/Theme/Backend/supplier-list.tpl.php @@ -37,12 +37,12 @@ echo $this->getData('nav')->render(); ?> $value) : ++$count; $url = UriFactory::build('{/prefix}purchase/supplier/profile?{?}&id=' . $value->getId()); ?> - printHtml($value->getNumber()); ?> - printHtml($value->getProfile()->getAccount()->getName1()); ?> - printHtml($value->getProfile()->getAccount()->getName2()); ?> - printHtml($value->getMainAddress()->getCity()); ?> - printHtml($value->getMainAddress()->getPostal()); ?> - printHtml($value->getMainAddress()->getAddress()); ?> + printHtml($value->number); ?> + printHtml($value->profile->account->name1); ?> + printHtml($value->profile->account->name2); ?> + printHtml($value->getMainAddress()->city); ?> + printHtml($value->getMainAddress()->postal); ?> + printHtml($value->getMainAddress()->address); ?> printHtml($value->getMainAddress()->getCountry()); ?> diff --git a/Theme/Backend/supplier-profile.tpl.php b/Theme/Backend/supplier-profile.tpl.php index 549e4db..ada2c31 100644 --- a/Theme/Backend/supplier-profile.tpl.php +++ b/Theme/Backend/supplier-profile.tpl.php @@ -50,7 +50,7 @@ echo $this->getData('nav')->render();
- request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
@@ -59,24 +59,24 @@ echo $this->getData('nav')->render();
-
+
-
+
-
+
-
+

getHtml('Address'); ?>

- getMainAddress()->getAddition())) : ?> + getMainAddress()->addition)) : ?>
-
+
-
+
-
+
-
+
request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-2' ? ' checked' : ''; ?>>
@@ -247,7 +247,7 @@ echo $this->getData('nav')->render();
- request->getUri()->getFragment() === 'c-tab-3' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-3' ? ' checked' : ''; ?>>
@@ -279,7 +279,7 @@ echo $this->getData('nav')->render();
- request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-4' ? ' checked' : ''; ?>>
@@ -311,7 +311,7 @@ echo $this->getData('nav')->render();
- request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
@@ -333,7 +333,7 @@ echo $this->getData('nav')->render();
- request->getUri()->getFragment() === 'c-tab-6' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-6' ? ' checked' : ''; ?>>
@@ -375,7 +375,7 @@ echo $this->getData('nav')->render();
- request->getUri()->getFragment() === 'c-tab-7' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-7' ? ' checked' : ''; ?>>
@@ -405,10 +405,10 @@ echo $this->getData('nav')->render();
- request->getUri()->getFragment() === 'c-tab-8' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-8' ? ' checked' : ''; ?>>
- request->getUri()->getFragment() === 'c-tab-9' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-9' ? ' checked' : ''; ?>>
@@ -434,8 +434,8 @@ echo $this->getData('nav')->render();
printHtml($this->request->getOrigin()); ?> - printHtml($this->request->getHeader()->getAccount()); ?> - printHtml($this->request->getHeader()->getAccount()); ?> + printHtml($this->request->header->account); ?> + printHtml($this->request->header->account); ?> Creating customer printHtml((new \DateTime('now'))->format('Y-m-d H:i:s')); ?>