Browse Source

Refactoring architecture dossiers : dossier domain + suppression dossiers superflus

feature/souke
Guillaume Bourgeois 9 months ago
parent
commit
a400b26a63
100 changed files with 310 additions and 513 deletions
  1. +1
    -2
      backend/controllers/AccessController.php
  2. +3
    -3
      backend/controllers/BackendController.php
  3. +1
    -1
      backend/controllers/CommunicateAdminController.php
  4. +1
    -1
      backend/controllers/CommunicateController.php
  5. +4
    -5
      backend/controllers/CronController.php
  6. +1
    -3
      backend/controllers/DeliveryNoteController.php
  7. +5
    -6
      backend/controllers/DistributionController.php
  8. +10
    -11
      backend/controllers/DocumentController.php
  9. +1
    -2
      backend/controllers/InvoiceController.php
  10. +10
    -10
      backend/controllers/OrderController.php
  11. +6
    -8
      backend/controllers/PointSaleController.php
  12. +6
    -6
      backend/controllers/ProducerAdminController.php
  13. +4
    -5
      backend/controllers/ProducerController.php
  14. +3
    -5
      backend/controllers/ProducerPriceRangeAdminController.php
  15. +3
    -4
      backend/controllers/ProductCategoryController.php
  16. +9
    -9
      backend/controllers/ProductController.php
  17. +2
    -2
      backend/controllers/QuotationController.php
  18. +1
    -2
      backend/controllers/SiteController.php
  19. +2
    -3
      backend/controllers/SubscriptionController.php
  20. +2
    -3
      backend/controllers/SupportAdminController.php
  21. +2
    -2
      backend/controllers/SupportController.php
  22. +4
    -4
      backend/controllers/TaxRateAdminController.php
  23. +8
    -9
      backend/controllers/UserController.php
  24. +3
    -3
      backend/controllers/UserGroupController.php
  25. +1
    -1
      backend/forms/AdminSettingsForm.php
  26. +1
    -1
      backend/models/AccessUserProducerForm.php
  27. +0
    -5
      backend/models/CreditForm.php
  28. +7
    -7
      backend/models/MailForm.php
  29. +8
    -9
      backend/views/dashboard/index.php
  30. +4
    -5
      backend/views/delivery-note/index.php
  31. +6
    -6
      backend/views/distribution/report-bourlingue.php
  32. +3
    -3
      backend/views/distribution/report-grid.php
  33. +1
    -1
      backend/views/distribution/shopping-cart-labels.php
  34. +4
    -4
      backend/views/document/_download_product_line.php
  35. +1
    -8
      backend/views/document/_form.php
  36. +2
    -2
      backend/views/document/download.php
  37. +3
    -3
      backend/views/document/form/_payment.php
  38. +3
    -4
      backend/views/invoice/index.php
  39. +5
    -6
      backend/views/layouts/header.php
  40. +2
    -2
      backend/views/layouts/left.php
  41. +0
    -4
      backend/views/online-admin/index.php
  42. +2
    -2
      backend/views/order/report.php
  43. +6
    -6
      backend/views/point-sale/_form.php
  44. +3
    -3
      backend/views/point-sale/index.php
  45. +1
    -1
      backend/views/producer-admin/_form.php
  46. +1
    -1
      backend/views/producer-admin/billing.php
  47. +4
    -4
      backend/views/producer-admin/index.php
  48. +10
    -10
      backend/views/producer/update.php
  49. +4
    -4
      backend/views/product/_form.php
  50. +4
    -5
      backend/views/product/index.php
  51. +4
    -4
      backend/views/product/update/prices/_form.php
  52. +3
    -3
      backend/views/product/update/prices/list.php
  53. +2
    -2
      backend/views/quotation/index.php
  54. +1
    -1
      backend/views/setting-admin/index.php
  55. +2
    -2
      backend/views/subscription/_form.php
  56. +7
    -7
      backend/views/subscription/index.php
  57. +2
    -4
      backend/views/support/index.php
  58. +2
    -2
      backend/views/support/view.php
  59. +5
    -5
      backend/views/user/_form.php
  60. +3
    -3
      backend/views/user/credit.php
  61. +6
    -6
      backend/views/user/index.php
  62. +1
    -1
      common/components/AlwaysdataClient.php
  63. +1
    -2
      common/components/BusinessLogic.php
  64. +33
    -33
      common/components/BusinessLogicTrait.php
  65. +1
    -1
      common/components/MailerService.php
  66. +1
    -1
      common/components/Tiller/TillerClientV2.php
  67. +6
    -2
      common/components/Tiller/TillerClientV3.php
  68. +1
    -1
      common/components/View.php
  69. +14
    -14
      common/config/main.php
  70. +1
    -1
      common/controllers/CommonController.php
  71. +1
    -1
      common/forms/ContactForm.php
  72. +2
    -2
      common/forms/LoginForm.php
  73. +6
    -7
      common/forms/SubscriptionForm.php
  74. +1
    -1
      common/helpers/CSV.php
  75. +2
    -3
      common/helpers/GlobalParam.php
  76. +1
    -1
      common/helpers/Price.php
  77. +0
    -11
      common/logic/Distribution/Distribution/Event/DistributionActiveEvent.php
  78. +0
    -14
      common/logic/Distribution/PointSaleDistribution/Service/PointSaleDistributionDefinition.php
  79. +0
    -14
      common/logic/Distribution/ProductDistribution/Service/ProductDistributionDefinition.php
  80. +0
    -8
      common/logic/Document/Document/Model/DocumentInterface.php
  81. +0
    -18
      common/logic/Document/Quotation/Repository/QuotationRepositoryQuery.php
  82. +0
    -11
      common/logic/Order/Order/Service/OrderManager.php
  83. +0
    -10
      common/logic/PointSale/UserPointSale/Service/UserPointSaleSolver.php
  84. +0
    -18
      common/logic/Producer/ProducerPriceRange/Repository/ProducerPriceRangeRepositoryQuery.php
  85. +0
    -18
      common/logic/Product/ProductCategory/Repository/ProductCategoryRepositoryQuery.php
  86. +0
    -18
      common/logic/Product/ProductPointSale/Repository/ProductPointSaleRepositoryQuery.php
  87. +0
    -10
      common/logic/RepositoryQueryInterface.php
  88. +0
    -14
      common/logic/Subscription/ProductSubscription/Service/ProductSubscriptionDefinition.php
  89. +2
    -2
      common/mail/creditUser-html.php
  90. +2
    -2
      common/mail/creditUser-text.php
  91. +3
    -3
      common/mail/orderConfirm-html.php
  92. +4
    -4
      common/mail/orderConfirm-text.php
  93. +3
    -3
      common/mail/orderConfirmProducer-html.php
  94. +3
    -3
      common/mail/orderConfirmProducer-text.php
  95. +1
    -1
      common/mail/paymentError-html.php
  96. +1
    -1
      common/mail/paymentErrorProducer-html.php
  97. +1
    -1
      common/mail/paymentErrorProducer-text.php
  98. +1
    -1
      common/mail/sendDocument-html.php
  99. +1
    -1
      common/mail/sendDocument-text.php
  100. +1
    -1
      common/mail/signup-html.php

+ 1
- 2
backend/controllers/AccessController.php View File

namespace backend\controllers; namespace backend\controllers;


use backend\models\AccessUserProducerForm; use backend\models\AccessUserProducerForm;
use common\logic\User\User\Model\UserSearch;
use domain\User\User\UserSearch;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\filters\VerbFilter;


/** /**
* UserController implements the CRUD actions for User model. * UserController implements the CRUD actions for User model.

+ 3
- 3
backend/controllers/BackendController.php View File

namespace backend\controllers; namespace backend\controllers;


use common\controllers\CommonController; use common\controllers\CommonController;
use common\logic\PointSale\PointSale\Model\PointSale;
use common\logic\Producer\Producer\Model\Producer;
use common\logic\Product\Product\Model\Product;
use domain\PointSale\PointSale\PointSale;
use domain\Producer\Producer\Producer;
use domain\Product\Product\Product;


class BackendController extends CommonController class BackendController extends CommonController
{ {

+ 1
- 1
backend/controllers/CommunicateAdminController.php View File

namespace backend\controllers; namespace backend\controllers;


use backend\models\MailForm; use backend\models\MailForm;
use common\logic\User\User\Model\User;
use domain\User\User\User;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\filters\VerbFilter; use yii\filters\VerbFilter;
use yii\web\NotFoundHttpException; use yii\web\NotFoundHttpException;

+ 1
- 1
backend/controllers/CommunicateController.php View File



use backend\models\MailForm; use backend\models\MailForm;
use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\logic\PointSale\PointSale\Model\PointSale;
use kartik\mpdf\Pdf; use kartik\mpdf\Pdf;
use domain\PointSale\PointSale\PointSale;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\filters\VerbFilter; use yii\filters\VerbFilter;



+ 4
- 5
backend/controllers/CronController.php View File



namespace backend\controllers; namespace backend\controllers;


use common\helpers\GlobalParam;
use common\helpers\MeanPayment; use common\helpers\MeanPayment;
use common\logic\Distribution\Distribution\Service\ExportManager;
use common\logic\Order\Order\Model\Order;
use common\logic\User\User\Model\User;
use domain\Distribution\Distribution\ExportManager;
use domain\Order\Order\Order;
use domain\User\User\User;
use Yii; use Yii;
use yii\filters\VerbFilter;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\filters\VerbFilter;


/** /**
* UserController implements the CRUD actions for User model. * UserController implements the CRUD actions for User model.

+ 1
- 3
backend/controllers/DeliveryNoteController.php View File



namespace backend\controllers; namespace backend\controllers;


use common\logic\Document\DeliveryNote\Model\DeliveryNoteSearch;
use Yii;
use domain\Document\DeliveryNote\DeliveryNoteSearch;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\filters\VerbFilter;


class DeliveryNoteController extends DocumentController class DeliveryNoteController extends DocumentController
{ {

+ 5
- 6
backend/controllers/DistributionController.php View File

use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\helpers\MeanPayment; use common\helpers\MeanPayment;
use common\helpers\Price; use common\helpers\Price;
use common\logic\Distribution\Distribution\Model\Distribution;
use common\logic\Distribution\Distribution\Service\ExportManager;
use common\logic\Document\DeliveryNote\Model\DeliveryNote;
use common\logic\Order\Order\Model\Order;
use common\logic\Producer\Producer\Model\Producer;
use common\logic\Product\Product\Model\Product;
use domain\Distribution\Distribution\Distribution;
use domain\Document\DeliveryNote\DeliveryNote;
use domain\Order\Order\Order;
use domain\Producer\Producer\Producer;
use DateTime; use DateTime;
use domain\Product\Product\Product;
use yii\base\ErrorException; use yii\base\ErrorException;
use yii\base\Exception; use yii\base\Exception;
use yii\filters\AccessControl; use yii\filters\AccessControl;

+ 10
- 11
backend/controllers/DocumentController.php View File

use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\helpers\MeanPayment; use common\helpers\MeanPayment;
use common\helpers\Price; use common\helpers\Price;
use common\logic\Document\DeliveryNote\Model\DeliveryNote;
use common\logic\Document\Document\Model\Document;
use common\logic\Document\Invoice\Model\Invoice;
use common\logic\Document\Quotation\Model\Quotation;
use common\logic\Order\Order\Model\Order;
use common\logic\Order\ProductOrder\Model\ProductOrder;
use common\logic\Product\Product\Model\Product;
use domain\Document\DeliveryNote\DeliveryNote;
use domain\Document\Document\Document;
use domain\Document\Invoice\Invoice;
use domain\Document\Quotation\Quotation;
use domain\Order\Order\Order;
use domain\Order\ProductOrder\ProductOrder;
use domain\Payment\Payment;
use kartik\mpdf\Pdf; use kartik\mpdf\Pdf;
use yii\base\UserException;
use domain\Product\Product\Product;
use yii; use yii;
use yii\filters\VerbFilter;
use yii\base\UserException;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\web\NotFoundHttpException;
use yii\helpers\Html; use yii\helpers\Html;
use common\logic\Payment\Model\Payment;
use yii\web\NotFoundHttpException;


class DocumentController extends BackendController class DocumentController extends BackendController
{ {

+ 1
- 2
backend/controllers/InvoiceController.php View File

namespace backend\controllers; namespace backend\controllers;


use common\helpers\Ajax; use common\helpers\Ajax;
use common\logic\Document\Invoice\Model\InvoiceSearch;
use common\logic\Order\Order\Model\Order;
use domain\Document\Invoice\InvoiceSearch;


class InvoiceController extends DocumentController class InvoiceController extends DocumentController
{ {

+ 10
- 10
backend/controllers/OrderController.php View File

use common\helpers\CSV; use common\helpers\CSV;
use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\helpers\Price; use common\helpers\Price;
use common\logic\Distribution\Distribution\Model\Distribution;
use common\logic\Distribution\PointSaleDistribution\Model\PointSaleDistribution;
use common\logic\Distribution\ProductDistribution\Model\ProductDistribution;
use common\logic\Order\Order\Model\Order;
use common\logic\Order\ProductOrder\Model\ProductOrder;
use common\logic\PointSale\PointSale\Model\PointSale;
use common\logic\Product\Product\Model\Product;
use common\logic\Payment\Model\Payment;
use common\logic\User\User\Model\User;
use common\logic\User\UserProducer\Model\UserProducer;
use domain\Distribution\Distribution\Distribution;
use domain\Distribution\PointSaleDistribution\PointSaleDistribution;
use domain\Distribution\ProductDistribution\ProductDistribution;
use domain\Order\Order\Order;
use domain\Order\ProductOrder\ProductOrder;
use domain\Payment\Payment;
use domain\PointSale\PointSale\PointSale;
use domain\Product\Product\Product;
use domain\User\User\User;
use domain\User\UserProducer\UserProducer;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\helpers\Html; use yii\helpers\Html;



+ 6
- 8
backend/controllers/PointSaleController.php View File

namespace backend\controllers; namespace backend\controllers;


use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\logic\Distribution\PointSaleDistribution\Model\PointSaleDistribution;
use common\logic\Order\Order\Model\Order;
use common\logic\PointSale\PointSale\Model\PointSale;
use common\logic\PointSale\PointSale\Model\PointSaleSearch;
use common\logic\PointSale\UserPointSale\Model\UserPointSale;
use Yii;
use domain\Distribution\PointSaleDistribution\PointSaleDistribution;
use domain\Order\Order\Order;
use domain\PointSale\PointSale\PointSale;
use domain\PointSale\PointSale\PointSaleSearch;
use domain\PointSale\UserPointSale\UserPointSale;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
use yii\helpers\Html; use yii\helpers\Html;
use yii\web\NotFoundHttpException;


class PointSaleController extends BackendController class PointSaleController extends BackendController
{ {

+ 6
- 6
backend/controllers/ProducerAdminController.php View File



use common\helpers\Ajax; use common\helpers\Ajax;
use common\helpers\Alwaysdata; use common\helpers\Alwaysdata;
use common\logic\Order\Order\Model\Order;
use common\logic\Producer\Producer\Model\Producer;
use common\logic\Product\Product\Model\Product;
use domain\Order\Order\Order;
use domain\Producer\Producer\Producer;
use domain\Product\Product\Product;
use Yii; use Yii;
use yii\data\ActiveDataProvider;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use yii\helpers\Html; use yii\helpers\Html;
use yii\web\NotFoundHttpException; use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
use yii\filters\AccessControl;
use yii\data\ActiveDataProvider;


class ProducerAdminController extends BackendController class ProducerAdminController extends BackendController
{ {

+ 4
- 5
backend/controllers/ProducerController.php View File

namespace backend\controllers; namespace backend\controllers;


use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\logic\Producer\Producer\Model\Producer;
use common\logic\Producer\ProducerPriceRange\Model\ProducerPriceRange;
use domain\Producer\ProducerPriceRange\ProducerPriceRange;
use domain\Producer\Producer\Producer;
use Yii; use Yii;
use yii\data\ActiveDataProvider; use yii\data\ActiveDataProvider;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use common\helpers\Upload;
use yii\filters\VerbFilter;
use yii\web\NotFoundHttpException;
use yii\web\UploadedFile; use yii\web\UploadedFile;


/** /**

+ 3
- 5
backend/controllers/ProducerPriceRangeAdminController.php View File



namespace backend\controllers; namespace backend\controllers;


use common\logic\Producer\ProducerPriceRange\Model\ProducerPriceRange;
use Yii;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
use yii\filters\AccessControl;
use domain\Producer\ProducerPriceRange\ProducerPriceRange;
use yii\data\ActiveDataProvider; use yii\data\ActiveDataProvider;
use yii\filters\AccessControl;
use yii\web\NotFoundHttpException;


/** /**
* ProducerPriceRangeAdminController implements the CRUD actions for ProducerPriceRange model. * ProducerPriceRangeAdminController implements the CRUD actions for ProducerPriceRange model.

+ 3
- 4
backend/controllers/ProductCategoryController.php View File

namespace backend\controllers; namespace backend\controllers;


use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\logic\Product\Product\Model\Product;
use common\logic\Product\ProductCategory\Model\ProductCategorySearch;
use domain\Product\Product\Product;
use domain\Product\ProductCategory\ProductCategorySearch;
use Yii; use Yii;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
use yii\helpers\Html; use yii\helpers\Html;
use yii\web\NotFoundHttpException;


/** /**
* ProductCategoryController implements the CRUD actions for ProductCategory model. * ProductCategoryController implements the CRUD actions for ProductCategory model.

+ 9
- 9
backend/controllers/ProductController.php View File

use backend\forms\ProductPriceUploadForm; use backend\forms\ProductPriceUploadForm;
use common\helpers\CSV; use common\helpers\CSV;
use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\logic\Feature\Feature\Feature;
use common\logic\PointSale\PointSale\Model\PointSale;
use common\logic\Product\Product\Model\Product;
use common\logic\Product\Product\Model\ProductSearch;
use common\logic\Product\ProductPointSale\Model\ProductPointSale;
use common\logic\Product\ProductPrice\Model\ProductPrice;
use common\logic\Product\ProductPrice\Model\ProductPriceSearch;
use common\logic\User\UserProducer\Model\UserProducer;
use common\helpers\Upload;
use domain\Feature\Feature\Feature;
use domain\PointSale\PointSale\PointSale;
use domain\Product\Product\Product;
use domain\Product\Product\ProductSearch;
use domain\Product\ProductPointSale\ProductPointSale;
use domain\Product\ProductPrice\Model\ProductPrice;
use domain\Product\ProductPrice\Model\ProductPriceSearch;
use domain\User\UserProducer\UserProducer;
use Yii; use Yii;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\helpers\Html; use yii\helpers\Html;
use yii\web\NotFoundHttpException; use yii\web\NotFoundHttpException;
use common\helpers\Upload;
use yii\web\UploadedFile; use yii\web\UploadedFile;


/** /**

+ 2
- 2
backend/controllers/QuotationController.php View File

namespace backend\controllers; namespace backend\controllers;


use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\logic\Document\Quotation\Model\QuotationSearch;
use common\logic\Order\Order\Model\Order;
use domain\Document\Quotation\QuotationSearch;
use domain\Order\Order\Order;
use yii\base\UserException; use yii\base\UserException;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\helpers\Html; use yii\helpers\Html;

+ 1
- 2
backend/controllers/SiteController.php View File



namespace backend\controllers; namespace backend\controllers;


use common\logic\User\User\Model\User;
use common\forms\LoginForm;
use Yii; use Yii;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use common\forms\LoginForm;
use yii\filters\VerbFilter; use yii\filters\VerbFilter;


/** /**

+ 2
- 3
backend/controllers/SubscriptionController.php View File



use common\forms\SubscriptionForm; use common\forms\SubscriptionForm;
use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\logic\Config\Unit\Service\UnitDefinition;
use common\logic\Product\Product\Model\Product;
use common\logic\Subscription\Subscription\Model\SubscriptionSearch;
use domain\Product\Product\Product;
use domain\Subscription\Subscription\SubscriptionSearch;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\web\NotFoundHttpException; use yii\web\NotFoundHttpException;



+ 2
- 3
backend/controllers/SupportAdminController.php View File



namespace backend\controllers; namespace backend\controllers;


use common\logic\Ticket\Ticket\Model\Ticket;
use common\logic\Ticket\Ticket\Model\TicketSearch;
use yii\filters\VerbFilter;
use domain\Ticket\Ticket\Ticket;
use domain\Ticket\Ticket\TicketSearch;
use yii\filters\AccessControl; use yii\filters\AccessControl;


/** /**

+ 2
- 2
backend/controllers/SupportController.php View File



namespace backend\controllers; namespace backend\controllers;


use common\logic\Ticket\Ticket\Model\Ticket;
use common\logic\Ticket\Ticket\Model\TicketSearch;
use domain\Ticket\Ticket\Ticket;
use domain\Ticket\Ticket\TicketSearch;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\helpers\Html; use yii\helpers\Html;
use yii\web\NotFoundHttpException; use yii\web\NotFoundHttpException;

+ 4
- 4
backend/controllers/TaxRateAdminController.php View File



namespace backend\controllers; namespace backend\controllers;


use common\logic\Config\TaxRate\Model\TaxRate;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
use yii\filters\AccessControl;
use domain\Config\TaxRate\TaxRate;
use yii\data\ActiveDataProvider; use yii\data\ActiveDataProvider;
use yii\filters\AccessControl;
use yii\filters\VerbFilter;
use yii\web\NotFoundHttpException;


/** /**
* TaxRateAdminController implements the CRUD actions for TaxRate model. * TaxRateAdminController implements the CRUD actions for TaxRate model.

+ 8
- 9
backend/controllers/UserController.php View File



use backend\models\CreditForm; use backend\models\CreditForm;
use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use backend\models\MailForm;
use common\helpers\Password; use common\helpers\Password;
use common\logic\Order\Order\Model\OrderSearch;
use common\logic\PointSale\PointSale\Model\PointSale;
use common\logic\PointSale\UserPointSale\Model\UserPointSale;
use common\logic\User\User\Model\User;
use common\logic\User\User\Model\UserSearch;
use common\logic\User\UserProducer\Model\UserProducer;
use common\logic\User\UserUserGroup\Model\UserUserGroup;
use domain\Order\Order\OrderSearch;
use domain\PointSale\PointSale\PointSale;
use domain\PointSale\UserPointSale\UserPointSale;
use domain\User\User\User;
use domain\User\User\UserSearch;
use domain\User\UserProducer\UserProducer;
use domain\User\UserUserGroup\UserUserGroup;
use Yii;
use yii\base\UserException; use yii\base\UserException;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use \Yii;
use yii\helpers\Html; use yii\helpers\Html;
use yii\web\NotFoundHttpException; use yii\web\NotFoundHttpException;



+ 3
- 3
backend/controllers/UserGroupController.php View File

namespace backend\controllers; namespace backend\controllers;


use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\logic\User\UserGroup\Model\UserGroupSearch;
use common\logic\User\UserUserGroup\Model\UserUserGroup;
use domain\User\UserGroup\UserGroupSearch;
use domain\User\UserUserGroup\UserUserGroup;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use yii\web\NotFoundHttpException;
use yii\helpers\Html; use yii\helpers\Html;
use yii\web\NotFoundHttpException;


/** /**
* PointVenteController implements the CRUD actions for PointVente model. * PointVenteController implements the CRUD actions for PointVente model.

+ 1
- 1
backend/forms/AdminSettingsForm.php View File



namespace backend\forms; namespace backend\forms;


use common\logic\Setting\SettingModule;
use domain\Setting\SettingModule;
use yii\base\Model; use yii\base\Model;


class AdminSettingsForm extends Model class AdminSettingsForm extends Model

+ 1
- 1
backend/models/AccessUserProducerForm.php View File

namespace backend\models; namespace backend\models;


use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\logic\User\User\Model\User;
use domain\User\User\User;
use yii\base\Model; use yii\base\Model;


/** /**

+ 0
- 5
backend/models/CreditForm.php View File



namespace backend\models; namespace backend\models;


use common\helpers\GlobalParam;
use common\logic\Payment\Module\PaymentModule;
use common\logic\Producer\Producer\Module\ProducerModule;
use common\logic\User\User\Module\UserModule;
use common\logic\User\UserProducer\Module\UserProducerModule;
use yii\base\Model; use yii\base\Model;


/** /**

+ 7
- 7
backend/models/MailForm.php View File



use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\helpers\Mailjet; use common\helpers\Mailjet;
use common\logic\Config\Unit\Service\UnitDefinition;
use common\logic\Distribution\Distribution\Model\Distribution;
use common\logic\Distribution\Distribution\Module\DistributionModule;
use common\logic\Producer\Producer\Module\ProducerModule;
use common\logic\Product\Product\Model\Product;
use common\logic\Product\Product\Module\ProductModule;
use common\helpers\Price;
use domain\Config\Unit\UnitDefinition;
use domain\Distribution\Distribution\Distribution;
use domain\Distribution\Distribution\DistributionModule;
use domain\Producer\Producer\ProducerModule;
use domain\Product\Product\Product;
use domain\Product\Product\ProductModule;
use Yii; use Yii;
use yii\base\Model; use yii\base\Model;
use common\helpers\Price ;
use yii\helpers\Html; use yii\helpers\Html;


/** /**

+ 8
- 9
backend/views/dashboard/index.php View File

termes. termes.
*/ */


use common\helpers\GlobalParam;
use common\logic\Distribution\Distribution\Module\DistributionModule;
use common\logic\Order\Order\Model\Order;
use common\logic\Order\Order\Module\OrderModule;
use common\logic\Producer\Producer\Module\ProducerModule;
use common\logic\Setting\SettingModule;
use common\logic\Subscription\Subscription\Module\SubscriptionModule;
use common\logic\User\User\Module\UserModule;
use yii\helpers\Html ;
use domain\Distribution\Distribution\DistributionModule;
use domain\Order\Order\Order;
use domain\Order\Order\OrderModule;
use domain\Producer\Producer\ProducerModule;
use domain\Setting\SettingModule;
use domain\Subscription\Subscription\SubscriptionModule;
use domain\User\User\UserModule;
use yii\helpers\Html;


$distributionModule = DistributionModule::getInstance(); $distributionModule = DistributionModule::getInstance();
$userModule = UserModule::getInstance(); $userModule = UserModule::getInstance();

+ 4
- 5
backend/views/delivery-note/index.php View File

* termes. * termes.
*/ */


use common\logic\Document\DeliveryNote\Model\DeliveryNote;
use domain\Document\DeliveryNote\DeliveryNote;
use domain\Order\Order\Order;
use domain\PointSale\PointSale\PointSale;
use yii\grid\GridView; use yii\grid\GridView;
use common\logic\PointSale\PointSale\Model\PointSale;
use common\logic\Order\Order\Model\Order;
use yii\helpers\Html;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
use common\logic\Document\DeliveryNote\Module\DeliveryNoteModule;
use yii\helpers\Html;


$deliveryNoteModule = $this->getDeliveryNoteModule(); $deliveryNoteModule = $this->getDeliveryNoteModule();



+ 6
- 6
backend/views/distribution/report-bourlingue.php View File

*/ */


use common\helpers\Price; use common\helpers\Price;
use common\logic\Config\Unit\Module\UnitModule;
use common\logic\Config\Unit\Service\UnitDefinition;
use common\logic\Order\Order\Module\OrderModule;
use common\logic\Product\Product\Model\Product;
use common\logic\Product\Product\Module\ProductModule;
use common\logic\User\UserProducer\Model\UserProducer;
use domain\Config\Unit\UnitDefinition;
use domain\Config\Unit\UnitModule;
use domain\Order\Order\OrderModule;
use domain\Product\Product\Product;
use domain\Product\Product\ProductModule;
use domain\User\UserProducer\UserProducer;


$unitModule = UnitModule::getInstance(); $unitModule = UnitModule::getInstance();
$productModule = ProductModule::getInstance(); $productModule = ProductModule::getInstance();

+ 3
- 3
backend/views/distribution/report-grid.php View File

<?php <?php


use common\logic\Order\Order\Module\OrderModule;
use common\logic\Producer\Producer\Model\Producer;
use common\logic\Product\Product\Module\ProductModule;
use domain\Order\Order\OrderModule;
use domain\Producer\Producer\Producer;
use domain\Product\Product\ProductModule;


$orderModule = OrderModule::getInstance(); $orderModule = OrderModule::getInstance();



+ 1
- 1
backend/views/distribution/shopping-cart-labels.php View File

<?php <?php


use common\logic\Distribution\Distribution\Export\DistributionShoppingCartLabelsPdfGenerator;
use domain\Distribution\Distribution\Export\DistributionShoppingCartLabelsPdfGenerator;


$distributionShoppingCartLabelsPdfGenerator = DistributionShoppingCartLabelsPdfGenerator::getInstance(); $distributionShoppingCartLabelsPdfGenerator = DistributionShoppingCartLabelsPdfGenerator::getInstance();
$index = 0; $index = 0;

+ 4
- 4
backend/views/document/_download_product_line.php View File

<?php <?php


use common\helpers\Price; use common\helpers\Price;
use common\logic\Config\Unit\Module\UnitModule;
use common\logic\Order\ProductOrder\Module\ProductOrderModule;
use common\logic\Producer\Producer\Module\ProducerModule;
use common\logic\Product\Product\Model\Product;
use domain\Config\Unit\UnitModule;
use domain\Order\ProductOrder\ProductOrderModule;
use domain\Producer\Producer\ProducerModule;
use domain\Product\Product\Product;
use yii\helpers\Html; use yii\helpers\Html;


$documentModule = $this->getDocumentModule(); $documentModule = $this->getDocumentModule();

+ 1
- 8
backend/views/document/_form.php View File

* termes. * termes.
*/ */


use common\helpers\MeanPayment;use common\helpers\Price;
use common\logic\Document\Document\Module\DocumentModule;
use common\logic\Document\Invoice\Module\InvoiceModule;
use common\logic\Payment\Module\PaymentModule;
use common\logic\Producer\Producer\Module\ProducerModule;
use common\logic\User\User\Module\UserModule;
use yii\helpers\Html;
use yii\widgets\ActiveForm;
use domain\Document\Document\DocumentModule;use domain\Document\Invoice\InvoiceModule;use domain\Payment\PaymentModule;use domain\Producer\Producer\ProducerModule;use domain\User\User\UserModule;use yii\helpers\Html;use yii\widgets\ActiveForm;


\backend\assets\VuejsDocumentFormAsset::register($this); \backend\assets\VuejsDocumentFormAsset::register($this);



+ 2
- 2
backend/views/document/download.php View File

<?php <?php


use yii\helpers\Html;
use common\logic\Order\Order\Model\Order;
use common\helpers\Price; use common\helpers\Price;
use domain\Order\Order\Order;
use yii\helpers\Html;


$producerModule = $this->getProducerModule(); $producerModule = $this->getProducerModule();
$userModule = $this->getUserModule(); $userModule = $this->getUserModule();

+ 3
- 3
backend/views/document/form/_payment.php View File



use common\helpers\MeanPayment; use common\helpers\MeanPayment;
use common\helpers\Price; use common\helpers\Price;
use common\logic\Document\Document\Module\DocumentModule;
use common\logic\Document\Invoice\Module\InvoiceModule;
use common\logic\Payment\Module\PaymentModule;
use domain\Document\Document\DocumentModule;
use domain\Document\Invoice\InvoiceModule;
use domain\Payment\PaymentModule;
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;



+ 3
- 4
backend/views/invoice/index.php View File

* termes. * termes.
*/ */


use yii\helpers\Html;
use domain\Document\Invoice\Invoice;
use domain\Order\Order\Order;
use yii\grid\GridView; use yii\grid\GridView;
use common\helpers\Url;
use common\logic\Document\Invoice\Model\Invoice;
use common\logic\Order\Order\Model\Order;
use yii\helpers\Html;


$producerModule = $this->getProducerModule(); $producerModule = $this->getProducerModule();
$invoiceModule = $this-> getInvoiceModule(); $invoiceModule = $this-> getInvoiceModule();

+ 5
- 6
backend/views/layouts/header.php View File

* termes. * termes.
*/ */


use common\helpers\GlobalParam;
use common\helpers\Image; use common\helpers\Image;
use common\helpers\Price; use common\helpers\Price;
use common\logic\Producer\Producer\Module\ProducerModule;
use common\logic\User\User\Module\UserModule;
use domain\Distribution\Distribution\Distribution;
use domain\Producer\Producer\Producer;
use domain\Producer\Producer\ProducerModule;
use domain\User\User\UserModule;
use yii\helpers\Html; use yii\helpers\Html;
use common\helpers\GlobalParam;

use common\logic\Distribution\Distribution\Model\Distribution;
use common\logic\Producer\Producer\Model\Producer;


$userModule = UserModule::getInstance(); $userModule = UserModule::getInstance();
$producerModule = ProducerModule::getInstance(); $producerModule = ProducerModule::getInstance();

+ 2
- 2
backend/views/layouts/left.php View File

*/ */


use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\logic\Feature\Feature\Feature;
use common\logic\User\User\Module\UserModule;
use domain\Feature\Feature\Feature;
use domain\User\User\UserModule;


$producerModule = $this->getProducerModule(); $producerModule = $this->getProducerModule();
$userModule = UserModule::getInstance(); $userModule = UserModule::getInstance();

+ 0
- 4
backend/views/online-admin/index.php View File



use common\helpers\Image; use common\helpers\Image;
use yii\helpers\Html; use yii\helpers\Html;
use yii\grid\GridView;
use common\logic\User\User\Model\User;
use common\logic\Producer\Producer\Model\Producer;
use common\helpers\Price;


$producerModule = $this->getProducerModule(); $producerModule = $this->getProducerModule();
$userModule = $this->getUserModule(); $userModule = $this->getUserModule();

+ 2
- 2
backend/views/order/report.php View File

termes. termes.
*/ */


use common\logic\Order\Order\Model\Order;
use common\logic\Order\Order\Module\OrderModule;
use domain\Order\Order\Order;
use domain\Order\Order\OrderModule;


$orderModule = OrderModule::getInstance(); $orderModule = OrderModule::getInstance();



+ 6
- 6
backend/views/point-sale/_form.php View File

* termes. * termes.
*/ */


use common\logic\Distribution\Distribution\Module\DistributionModule;
use common\logic\Distribution\Distribution\Service\ExportManager;
use common\logic\Producer\Producer\Module\ProducerModule;
use domain\Distribution\Distribution\DistributionModule;
use domain\Distribution\Distribution\ExportManager;
use domain\Producer\Producer\Producer;
use domain\Producer\Producer\ProducerModule;
use lo\widgets\Toggle; use lo\widgets\Toggle;
use domain\User\User\UserModule;
use yii\helpers\ArrayHelper;
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
use yii\helpers\ArrayHelper;
use common\logic\Producer\Producer\Model\Producer;
use common\logic\User\User\Module\UserModule;


$producerModule = ProducerModule::getInstance(); $producerModule = ProducerModule::getInstance();
$userModule = UserModule::getInstance(); $userModule = UserModule::getInstance();

+ 3
- 3
backend/views/point-sale/index.php View File

* termes. * termes.
*/ */


use yii\helpers\Html;
use domain\PointSale\UserPointSale\UserPointSale;
use domain\Producer\Producer\Producer;
use yii\grid\GridView; use yii\grid\GridView;
use common\logic\PointSale\UserPointSale\Model\UserPointSale;
use common\logic\Producer\Producer\Model\Producer;
use yii\helpers\Html;


$pointSaleModule = $this->getPointSaleModule(); $pointSaleModule = $this->getPointSaleModule();



+ 1
- 1
backend/views/producer-admin/_form.php View File

termes. termes.
*/ */


use domain\Producer\Producer\Producer;
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
use common\logic\Producer\Producer\Model\Producer;


?> ?>



+ 1
- 1
backend/views/producer-admin/billing.php View File

termes. termes.
*/ */


use common\logic\Producer\Producer\Module\ProducerModule;
use domain\Producer\Producer\ProducerModule;


$this->setTitle('Facturation producteur ('.$producer->name.')') ; $this->setTitle('Facturation producteur ('.$producer->name.')') ;
$this->addBreadcrumb(['label' => 'Producteurs', 'url' => ['index']]) ; $this->addBreadcrumb(['label' => 'Producteurs', 'url' => ['index']]) ;

+ 4
- 4
backend/views/producer-admin/index.php View File

termes. termes.
*/ */


use yii\helpers\Html;
use yii\grid\GridView;
use common\logic\User\User\Model\User;
use common\logic\Producer\Producer\Model\Producer;
use common\helpers\Price; use common\helpers\Price;
use domain\Producer\Producer\Producer;
use domain\User\User\User;
use yii\grid\GridView;
use yii\helpers\Html;


$producerModule = $this->getProducerModule(); $producerModule = $this->getProducerModule();



+ 10
- 10
backend/views/producer/update.php View File



use common\helpers\Dropdown; use common\helpers\Dropdown;
use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\logic\Distribution\Distribution\Module\DistributionModule;
use common\logic\Distribution\Distribution\Service\ExportManager;
use common\logic\Feature\Feature\Feature;
use common\logic\Feature\Feature\FeatureModule;
use common\logic\User\User\Module\UserModule;
use common\logic\User\UserGroup\Module\UserGroupModule;
use domain\Config\TaxRate\TaxRate;
use domain\Distribution\Distribution\DistributionModule;
use domain\Distribution\Distribution\ExportManager;
use domain\Document\Document\Document;
use domain\Feature\Feature\Feature;
use domain\Feature\Feature\FeatureModule;
use domain\Producer\Producer\Producer;
use domain\User\User\UserModule;
use domain\User\UserGroup\UserGroupModule;
use yii\helpers\ArrayHelper;
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
use common\logic\Producer\Producer\Model\Producer;
use common\logic\Config\TaxRate\Model\TaxRate;
use common\logic\Document\Document\Model\Document;
use yii\helpers\ArrayHelper;


\backend\assets\VuejsProducerUpdateAsset::register($this); \backend\assets\VuejsProducerUpdateAsset::register($this);



+ 4
- 4
backend/views/product/_form.php View File

<?php <?php


use common\helpers\GlobalParam;
use common\helpers\Image; use common\helpers\Image;
use domain\PointSale\PointSale\PointSale;
use lo\widgets\Toggle; use lo\widgets\Toggle;
use yii\helpers\Html;
use domain\Product\Product\Product;
use yii\bootstrap\ActiveForm; use yii\bootstrap\ActiveForm;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
use common\helpers\GlobalParam;
use common\logic\Product\Product\Model\Product;
use common\logic\PointSale\PointSale\Model\PointSale;
use yii\helpers\Html;


$producerModule = $this->getProducerModule(); $producerModule = $this->getProducerModule();
$productCategoryModule = $this->getProductCategoryModule(); $productCategoryModule = $this->getProductCategoryModule();

+ 4
- 5
backend/views/product/index.php View File

* termes. * termes.
*/ */


use common\helpers\Image;
use yii\helpers\Html;
use yii\grid\GridView;
use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use \lo\widgets\Toggle;
use common\helpers\Image;
use common\helpers\Price; use common\helpers\Price;
use common\logic\Product\Product\Model\Product;
use lo\widgets\Toggle;
use yii\grid\GridView;
use yii\helpers\Html;


$productModule = $this->getProductModule(); $productModule = $this->getProductModule();



+ 4
- 4
backend/views/product/update/prices/_form.php View File

<?php <?php


use common\logic\Config\Unit\Module\UnitModule;
use common\logic\Product\Product\Module\ProductModule;
use yii\helpers\Html;
use yii\bootstrap\ActiveForm;
use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use domain\Config\Unit\UnitModule;
use domain\Product\Product\ProductModule;
use yii\bootstrap\ActiveForm;
use yii\helpers\Html;


$unitModule = UnitModule::getInstance(); $unitModule = UnitModule::getInstance();
$userModule = $this->getUserModule(); $userModule = $this->getUserModule();

+ 3
- 3
backend/views/product/update/prices/list.php View File

* termes. * termes.
*/ */


use common\logic\User\User\Module\UserModule;
use yii\helpers\Html;
use common\helpers\Price; use common\helpers\Price;
use domain\Product\Product\ProductModule;
use domain\User\User\UserModule;
use yii\grid\GridView; use yii\grid\GridView;
use common\logic\Product\Product\Module\ProductModule;
use yii\helpers\Html;


$productModule = ProductModule::getInstance(); $productModule = ProductModule::getInstance();
$userModule = UserModule::getInstance(); $userModule = UserModule::getInstance();

+ 2
- 2
backend/views/quotation/index.php View File

* termes. * termes.
*/ */


use common\logic\Document\Quotation\Model\Quotation;
use domain\Document\Quotation\Quotation;
use domain\Order\Order\Order;
use yii\grid\GridView; use yii\grid\GridView;
use common\logic\Order\Order\Model\Order;
use yii\helpers\Html; use yii\helpers\Html;


$quotationModule = $this->getQuotationModule(); $quotationModule = $this->getQuotationModule();

+ 1
- 1
backend/views/setting-admin/index.php View File

* termes. * termes.
*/ */


use common\logic\Setting\SettingModule;
use domain\Setting\SettingModule;
use lo\widgets\Toggle; use lo\widgets\Toggle;
use yii\bootstrap\ActiveForm; use yii\bootstrap\ActiveForm;
use yii\helpers\Html; use yii\helpers\Html;

+ 2
- 2
backend/views/subscription/_form.php View File

termes. termes.
*/ */


use domain\Subscription\Subscription\Subscription;
use yii\helpers\ArrayHelper;
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
use yii\helpers\ArrayHelper ;
use common\logic\Subscription\Subscription\Model\Subscription;


\backend\assets\VuejsSubscriptionFormAsset::register($this); \backend\assets\VuejsSubscriptionFormAsset::register($this);



+ 7
- 7
backend/views/subscription/index.php View File

termes. termes.
*/ */


use common\logic\Subscription\Subscription\Module\SubscriptionModule;
use yii\helpers\Html;
use common\helpers\GlobalParam;
use domain\PointSale\PointSale\PointSale;
use domain\Product\Product\Product;
use domain\Product\Product\ProductModule;
use domain\Subscription\Subscription\Subscription;
use domain\Subscription\Subscription\SubscriptionModule;
use yii\grid\GridView; use yii\grid\GridView;
use common\helpers\GlobalParam ;
use common\logic\Subscription\Subscription\Model\Subscription;
use common\logic\PointSale\PointSale\Model\PointSale;
use common\logic\Product\Product\Module\ProductModule;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
use common\logic\Product\Product\Model\Product;
use yii\helpers\Html;


$subscriptionModule = SubscriptionModule::getInstance(); $subscriptionModule = SubscriptionModule::getInstance();



+ 2
- 4
backend/views/support/index.php View File

* termes. * termes.
*/ */


use common\helpers\Image;
use common\logic\Ticket\Ticket\Model\Ticket;
use common\logic\Ticket\Ticket\Module\TicketModule;
use yii\helpers\Html;
use domain\Ticket\Ticket\TicketModule;
use yii\grid\GridView; use yii\grid\GridView;
use yii\helpers\Html;


/** /**
* @var $this common\components\ViewBackend * @var $this common\components\ViewBackend

+ 2
- 2
backend/views/support/view.php View File

<?php <?php


use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\logic\Ticket\Ticket\Module\TicketModule;
use common\logic\User\User\Module\UserModule;
use domain\Ticket\Ticket\TicketModule;
use domain\User\User\UserModule;
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;



+ 5
- 5
backend/views/user/_form.php View File

* termes. * termes.
*/ */


use common\logic\Distribution\Distribution\Module\DistributionModule;
use common\logic\Distribution\Distribution\Service\ExportManager;
use common\logic\Producer\Producer\Module\ProducerModule;
use common\logic\User\User\Module\UserModule;
use domain\Distribution\Distribution\DistributionModule;
use domain\Distribution\Distribution\ExportManager;
use domain\Producer\Producer\ProducerModule;
use lo\widgets\Toggle; use lo\widgets\Toggle;
use domain\User\User\UserModule;
use yii\helpers\ArrayHelper;
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
use yii\helpers\ArrayHelper;


\backend\assets\VuejsUserFormAsset::register($this); \backend\assets\VuejsUserFormAsset::register($this);



+ 3
- 3
backend/views/user/credit.php View File

termes. termes.
*/ */


use common\helpers\GlobalParam;
use common\helpers\MeanPayment;
use domain\Payment\Payment;
use yii\grid\GridView; use yii\grid\GridView;
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
use common\helpers\GlobalParam;
use common\logic\Payment\Model\Payment;
use common\helpers\MeanPayment;


$paymentManager = $this->getPaymentModule(); $paymentManager = $this->getPaymentModule();
$producerModule = $this->getProducerModule(); $producerModule = $this->getProducerModule();

+ 6
- 6
backend/views/user/index.php View File

*/ */


use common\helpers\GlobalParam; use common\helpers\GlobalParam;
use common\logic\Producer\Producer\Module\ProducerModule;
use common\logic\User\UserGroup\Module\UserGroupModule;
use yii\helpers\Html;
use domain\Order\Order\Order;
use domain\Producer\Producer\ProducerModule;
use domain\User\User\UserModule;
use domain\User\UserProducer\UserProducer;
use yii\grid\GridView; use yii\grid\GridView;
use common\logic\User\User\Module\UserModule;
use common\logic\Order\Order\Model\Order;
use common\logic\User\UserProducer\Model\UserProducer;
use yii\helpers\Html;
use domain\User\UserGroup\UserGroupModule;


$userModule = UserModule::getInstance(); $userModule = UserModule::getInstance();
$producerModule = ProducerModule::getInstance(); $producerModule = ProducerModule::getInstance();

+ 1
- 1
common/components/AlwaysdataClient.php View File

namespace common\components; namespace common\components;


use common\helpers\Password; use common\helpers\Password;
use common\logic\Producer\Producer\Model\Producer;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use domain\Producer\Producer\Producer;
use yii\base\ErrorException; use yii\base\ErrorException;


class AlwaysdataClient class AlwaysdataClient

+ 1
- 2
common/components/BusinessLogic.php View File



namespace common\components; namespace common\components;


use common\logic\Producer\Producer\Model\Producer;
use common\logic\ProducerContextTrait;
use domain\Producer\Producer\Producer;
use yii\base\ErrorException; use yii\base\ErrorException;


class BusinessLogic class BusinessLogic

+ 33
- 33
common/components/BusinessLogicTrait.php View File



namespace common\components; namespace common\components;


use common\logic\Config\TaxRate\Module\TaxRateModule;
use common\logic\Config\Unit\Module\UnitModule;
use common\logic\Distribution\Distribution\Module\DistributionModule;
use common\logic\Distribution\PointSaleDistribution\Module\PointSaleDistributionModule;
use common\logic\Distribution\ProductDistribution\Module\ProductDistributionModule;
use common\logic\Document\DeliveryNote\Module\DeliveryNoteModule;
use common\logic\Document\Document\Module\DocumentModule;
use common\logic\Document\Invoice\Module\InvoiceModule;
use common\logic\Document\Quotation\Module\QuotationModule;
use common\logic\Feature\Feature\FeatureModule;
use common\logic\Feature\FeatureProducer\FeatureProducerModule;
use common\logic\Opinion\Module\OpinionModule;
use common\logic\Order\Order\Module\OrderModule;
use common\logic\Order\ProductOrder\Module\ProductOrderModule;
use common\logic\Payment\Module\PaymentModule;
use common\logic\PointSale\PointSale\Module\PointSaleModule;
use common\logic\PointSale\UserPointSale\Module\UserPointSaleModule;
use common\logic\Producer\Producer\Module\ProducerModule;
use common\logic\Producer\ProducerPriceRange\Module\ProducerPriceRangeModule;
use common\logic\Product\Product\Module\ProductModule;
use common\logic\Product\ProductCategory\Module\ProductCategoryModule;
use common\logic\Product\ProductPointSale\Module\ProductPointSaleModule;
use common\logic\Product\ProductPrice\Module\ProductPriceModule;
use common\logic\Setting\SettingModule;
use common\logic\Subscription\ProductSubscription\Module\ProductSubscriptionModule;
use common\logic\Subscription\Subscription\Module\SubscriptionModule;
use common\logic\Ticket\Ticket\Module\TicketModule;
use common\logic\Ticket\TicketMessage\Module\TicketMessageModule;
use common\logic\Ticket\TicketUser\Module\TicketUserModule;
use common\logic\User\User\Module\UserModule;
use common\logic\User\UserGroup\Module\UserGroupModule;
use common\logic\User\UserProducer\Module\UserProducerModule;
use common\logic\User\UserUserGroup\Module\UserUserGroupModule;
use domain\Config\TaxRate\TaxRateModule;
use domain\Config\Unit\UnitModule;
use domain\Distribution\Distribution\DistributionModule;
use domain\Distribution\PointSaleDistribution\PointSaleDistributionModule;
use domain\Distribution\ProductDistribution\ProductDistributionModule;
use domain\Document\DeliveryNote\DeliveryNoteModule;
use domain\Document\Document\DocumentModule;
use domain\Document\Invoice\InvoiceModule;
use domain\Document\Quotation\QuotationModule;
use domain\Feature\Feature\FeatureModule;
use domain\Feature\FeatureProducer\FeatureProducerModule;
use domain\Opinion\OpinionModule;
use domain\Order\Order\OrderModule;
use domain\Order\ProductOrder\ProductOrderModule;
use domain\Payment\PaymentModule;
use domain\PointSale\PointSale\PointSaleModule;
use domain\PointSale\UserPointSale\UserPointSaleModule;
use domain\Producer\Producer\ProducerModule;
use domain\Producer\ProducerPriceRange\ProducerPriceRangeModule;
use domain\Product\Product\ProductModule;
use domain\Product\ProductCategory\ProductCategoryModule;
use domain\Product\ProductPointSale\ProductPointSaleModule;
use domain\Product\ProductPrice\Module\ProductPriceModule;
use domain\Setting\SettingModule;
use domain\Subscription\ProductSubscription\ProductSubscriptionModule;
use domain\Subscription\Subscription\SubscriptionModule;
use domain\Ticket\Ticket\TicketModule;
use domain\Ticket\TicketMessage\TicketMessageModule;
use domain\Ticket\TicketUser\TicketUserModule;
use domain\User\User\UserModule;
use domain\User\UserGroup\UserGroupModule;
use domain\User\UserProducer\UserProducerModule;
use domain\User\UserUserGroup\UserUserGroupModule;


trait BusinessLogicTrait trait BusinessLogicTrait
{ {

+ 1
- 1
common/components/MailerService.php View File



namespace common\components; namespace common\components;


use common\logic\Producer\Producer\Model\Producer;
use domain\Producer\Producer\Producer;
use yii\mail\MessageInterface; use yii\mail\MessageInterface;


class MailerService class MailerService

+ 1
- 1
common/components/Tiller/TillerClientV2.php View File

$this->restaurantToken = $restaurantToken; $this->restaurantToken = $restaurantToken;
} }


public function getUrlAuthorizeCode(string $clientId, string $redirectUri): string
public function getUrlAuthorizeCode(string $clientId = null, string $redirectUri = null): string
{ {
return "#"; return "#";
} }

+ 6
- 2
common/components/Tiller/TillerClientV3.php View File

]; ];
} }


public function getUrlAuthorizeCode(string $clientId, string $redirectUri): string
public function getUrlAuthorizeCode(string $clientId = null, string $redirectUri = null): string
{ {
return "https://oauth.api.tiller.systems/oauth2/authorize?client_id=$clientId&response_type=code&scope=&redirect_uri=$redirectUri";
if($clientId && $redirectUri) {
return "https://oauth.api.tiller.systems/oauth2/authorize?client_id=$clientId&response_type=code&scope=&redirect_uri=$redirectUri";
}

return '#';
} }


public function isAuthenticated(): bool public function isAuthenticated(): bool

+ 1
- 1
common/components/View.php View File



namespace common\components ; namespace common\components ;


use common\logic\User\User\Model\User;
use domain\User\User\User;


class View extends \yii\web\View class View extends \yii\web\View
{ {

+ 14
- 14
common/config/main.php View File

use common\components\BusinessLogic; use common\components\BusinessLogic;
use common\components\DolibarrApi; use common\components\DolibarrApi;
use common\components\ForumFlarumClient; use common\components\ForumFlarumClient;
use common\logic\Distribution\Distribution\Model\Distribution;
use common\logic\Document\DeliveryNote\Model\DeliveryNote;
use common\logic\Order\Order\Model\Order;
use common\logic\Ticket\Ticket\Model\Ticket;
use common\logic\Payment\Model\Payment;
use common\logic\User\User\Model\User;
use domain\Distribution\Distribution\Distribution;
use domain\Document\DeliveryNote\DeliveryNote;
use domain\Order\Order\Order;
use domain\Payment\Payment;
use domain\Ticket\Ticket\Ticket;
use domain\User\User\User;


$serverName = isset($_SERVER['SERVER_NAME']) ?? '' ; $serverName = isset($_SERVER['SERVER_NAME']) ?? '' ;


], ],
'user' => [ 'user' => [
'class' => 'yii\web\User', 'class' => 'yii\web\User',
'identityClass' => 'common\logic\User\User\Model\User',
'identityClass' => 'domain\User\User\User',
'enableAutoLogin' => true, 'enableAutoLogin' => true,
'identityCookie' => [ 'identityCookie' => [
'name' => 'distrib', 'name' => 'distrib',
'observers' => [ 'observers' => [
User::class => [ User::class => [
// Producer : lien avec utilisateur // Producer : lien avec utilisateur
common\logic\Producer\Producer\Event\UserObserver::class
domain\Producer\Producer\Event\UserObserver::class
], ],
Order::class => [ Order::class => [
// Payment : remboursement commande // Payment : remboursement commande
common\logic\Payment\Event\OrderObserver::class
domain\Payment\Event\OrderObserver::class
], ],
Payment::class => [ Payment::class => [
// UserProducer : mise à jour du crédit // UserProducer : mise à jour du crédit
common\logic\User\UserProducer\Event\PaymentObserver::class
domain\User\UserProducer\Event\PaymentObserver::class
], ],
Distribution::class => [ Distribution::class => [
// Subscription : génération des commandes sur base des abonnements // Subscription : génération des commandes sur base des abonnements
common\logic\Subscription\Subscription\Event\DistributionObserver::class
domain\Subscription\Subscription\Event\DistributionObserver::class
], ],
DeliveryNote::class => [ DeliveryNote::class => [
// Order : assignation du bon de livraison aux commandes // Order : assignation du bon de livraison aux commandes
common\logic\Order\Order\Event\DeliveryNoteObserver::class,
domain\Order\Order\Event\DeliveryNoteObserver::class,
// DeliveryNote : validation automatique des bons de livraison // DeliveryNote : validation automatique des bons de livraison
common\logic\Document\DeliveryNote\Event\DeliveryNoteObserver::class
domain\Document\DeliveryNote\Event\DeliveryNoteObserver::class
], ],
Ticket::class => [ Ticket::class => [
// User : envoi email nouveau ticket à l'administrateur // User : envoi email nouveau ticket à l'administrateur
common\logic\User\User\Event\TicketObserver::class,
domain\User\User\Event\TicketObserver::class,
], ],
], ],
], ],

+ 1
- 1
common/controllers/CommonController.php View File

use common\components\BusinessLogic; use common\components\BusinessLogic;
use common\components\BusinessLogicTrait; use common\components\BusinessLogicTrait;
use common\components\ParameterBag; use common\components\ParameterBag;
use common\logic\User\User\Model\User;
use domain\User\User\User;
use yii; use yii;
use yii\web\Response; use yii\web\Response;



+ 1
- 1
common/forms/ContactForm.php View File



namespace common\forms; namespace common\forms;


use common\logic\Producer\Producer\Model\Producer;
use domain\Producer\Producer\Producer;
use Yii; use Yii;
use yii\base\Model; use yii\base\Model;



+ 2
- 2
common/forms/LoginForm.php View File



namespace common\forms; namespace common\forms;


use common\logic\Producer\Producer\Model\Producer;
use common\logic\User\User\Model\User;
use domain\Producer\Producer\Producer;
use domain\User\User\User;
use Yii; use Yii;
use yii\base\Model; use yii\base\Model;



+ 6
- 7
common/forms/SubscriptionForm.php View File



namespace common\forms; namespace common\forms;


use common\logic\Product\Product\Model\Product;
use common\logic\Product\Product\Module\ProductModule;
use common\logic\Subscription\ProductSubscription\Model\ProductSubscription;
use common\logic\Subscription\Subscription\Model\Subscription;
use common\logic\Subscription\Subscription\Module\SubscriptionModule;
use common\logic\User\User\Module\UserModule;
use Yii;
use domain\Product\Product\Product;
use domain\Product\Product\ProductModule;
use domain\Subscription\ProductSubscription\ProductSubscription;
use domain\Subscription\Subscription\Subscription;
use domain\Subscription\Subscription\SubscriptionModule;
use domain\User\User\UserModule;
use yii\base\Model; use yii\base\Model;


class SubscriptionForm extends Model class SubscriptionForm extends Model

+ 1
- 1
common/helpers/CSV.php View File



namespace common\helpers; namespace common\helpers;


use common\logic\Producer\Producer\Module\ProducerModule;
use domain\Producer\Producer\ProducerModule;


class CSV class CSV
{ {

+ 2
- 3
common/helpers/GlobalParam.php View File



namespace common\helpers; namespace common\helpers;


use common\logic\Producer\Producer\Model\Producer;
use common\logic\Producer\Producer\Module\ProducerModule;
use common\logic\User\User\Service\UserSolver;
use domain\Producer\Producer\ProducerModule;
use domain\User\User\UserSolver;


class GlobalParam class GlobalParam
{ {

+ 1
- 1
common/helpers/Price.php View File



namespace common\helpers; namespace common\helpers;


use common\logic\Document\Document\Model\Document;
use domain\Document\Document\Document;


class Price class Price
{ {

+ 0
- 11
common/logic/Distribution/Distribution/Event/DistributionActiveEvent.php View File

<?php

namespace common\logic\Distribution\Distribution\Event;

use common\logic\Distribution\Distribution\Model\Distribution;
use yii\base\Event;

class DistributionActiveEvent extends Event
{
public Distribution $distribution;
}

+ 0
- 14
common/logic/Distribution/PointSaleDistribution/Service/PointSaleDistributionDefinition.php View File

<?php

namespace common\logic\Distribution\PointSaleDistribution\Service;

use common\logic\AbstractDefinition;
use common\logic\Distribution\PointSaleDistribution\Model\PointSaleDistribution;

class PointSaleDistributionDefinition extends AbstractDefinition
{
public function getEntityFqcn(): string
{
return PointSaleDistribution::class;
}
}

+ 0
- 14
common/logic/Distribution/ProductDistribution/Service/ProductDistributionDefinition.php View File

<?php

namespace common\logic\Distribution\ProductDistribution\Service;

use common\logic\AbstractDefinition;
use common\logic\Distribution\ProductDistribution\Model\ProductDistribution;

class ProductDistributionDefinition extends AbstractDefinition
{
public function getEntityFqcn(): string
{
return ProductDistribution::class;
}
}

+ 0
- 8
common/logic/Document/Document/Model/DocumentInterface.php View File

<?php

namespace common\logic\Document\Document\Model;

interface DocumentInterface
{

}

+ 0
- 18
common/logic/Document/Quotation/Repository/QuotationRepositoryQuery.php View File

<?php

namespace common\logic\Document\Quotation\Repository;

use common\logic\AbstractRepositoryQuery;
use common\logic\Document\Quotation\Model\Quotation;
use common\logic\Document\Quotation\Service\QuotationDefinition;
use yii\db\ActiveQuery;

class QuotationRepositoryQuery extends AbstractRepositoryQuery
{
protected QuotationDefinition $definition;

public function loadDependencies(): void
{
$this->loadDefinition(QuotationDefinition::class);
}
}

+ 0
- 11
common/logic/Order/Order/Service/OrderManager.php View File

<?php

namespace common\logic\Order\Order\Service;

use common\logic\AbstractService;
use common\logic\ManagerInterface;

class OrderManager extends AbstractService implements ManagerInterface
{
}

+ 0
- 10
common/logic/PointSale/UserPointSale/Service/UserPointSaleSolver.php View File

<?php

namespace common\logic\PointSale\UserPointSale\Service;

use common\logic\AbstractSolver;

class UserPointSaleSolver extends AbstractSolver
{

}

+ 0
- 18
common/logic/Producer/ProducerPriceRange/Repository/ProducerPriceRangeRepositoryQuery.php View File

<?php

namespace common\logic\Producer\ProducerPriceRange\Repository;

use common\logic\AbstractRepositoryQuery;
use common\logic\Producer\ProducerPriceRange\Model\ProducerPriceRange;
use common\logic\Producer\ProducerPriceRange\Service\ProducerPriceRangeDefinition;
use yii\db\ActiveQuery;

class ProducerPriceRangeRepositoryQuery extends AbstractRepositoryQuery
{
protected ProducerPriceRangeDefinition $definition;

public function loadDependencies(): void
{
$this->loadDefinition(ProducerPriceRangeDefinition::class);
}
}

+ 0
- 18
common/logic/Product/ProductCategory/Repository/ProductCategoryRepositoryQuery.php View File

<?php

namespace common\logic\Product\ProductCategory\Repository;

use common\logic\AbstractRepositoryQuery;
use common\logic\Product\ProductCategory\Model\ProductCategory;
use common\logic\Product\ProductCategory\Service\ProductCategoryDefinition;
use yii\db\ActiveQuery;

class ProductCategoryRepositoryQuery extends AbstractRepositoryQuery
{
protected ProductCategoryDefinition $definition;

public function loadDependencies(): void
{
$this->loadDefinition(ProductCategoryDefinition::class);
}
}

+ 0
- 18
common/logic/Product/ProductPointSale/Repository/ProductPointSaleRepositoryQuery.php View File

<?php

namespace common\logic\Product\ProductPointSale\Repository;

use common\logic\AbstractRepositoryQuery;
use common\logic\Product\ProductPointSale\Model\ProductPointSale;
use common\logic\Product\ProductPointSale\Service\ProductPointSaleDefinition;
use yii\db\ActiveQuery;

class ProductPointSaleRepositoryQuery extends AbstractRepositoryQuery
{
protected ProductPointSaleDefinition $definition;

public function loadDependencies(): void
{
$this->loadDefinition(ProductPointSaleDefinition::class);
}
}

+ 0
- 10
common/logic/RepositoryQueryInterface.php View File

<?php

namespace common\logic;

use yii\db\ActiveQuery;

interface RepositoryQueryInterface
{

}

+ 0
- 14
common/logic/Subscription/ProductSubscription/Service/ProductSubscriptionDefinition.php View File

<?php

namespace common\logic\Subscription\ProductSubscription\Service;

use common\logic\AbstractDefinition;
use common\logic\Subscription\ProductSubscription\Model\ProductSubscription;

class ProductSubscriptionDefinition extends AbstractDefinition
{
public function getEntityFqcn(): string
{
return ProductSubscription::class;
}
}

+ 2
- 2
common/mail/creditUser-html.php View File

termes. termes.
*/ */


use common\logic\Payment\Model\Payment;
use yii\helpers\Html;
use common\helpers\Price; use common\helpers\Price;
use domain\Payment\Payment;
use yii\helpers\Html;


?> ?>



+ 2
- 2
common/mail/creditUser-text.php View File

termes. termes.
*/ */


use common\helpers\Price ;
use common\logic\Payment\Model\Payment;
use common\helpers\Price;
use domain\Payment\Payment;


?> ?>



+ 3
- 3
common/mail/orderConfirm-html.php View File

termes. termes.
*/ */


use common\logic\Order\Order\Model\Order;
use common\logic\Order\Order\Module\OrderModule;
use common\logic\Producer\Producer\Module\ProducerModule;
use domain\Order\Order\Order;
use domain\Order\Order\OrderModule;
use domain\Producer\Producer\ProducerModule;
use yii\helpers\Html; use yii\helpers\Html;


$producerModule = ProducerModule::getInstance(); $producerModule = ProducerModule::getInstance();

+ 4
- 4
common/mail/orderConfirm-text.php View File

termes. termes.
*/ */


use common\helpers\GlobalParam ;
use common\logic\Order\Order\Model\Order;
use common\helpers\GlobalParam;
use domain\Order\Order\Order;
use domain\Order\Order\OrderModule;
use domain\Producer\Producer\ProducerModule;
use yii\helpers\Html; use yii\helpers\Html;
use common\logic\Producer\Producer\Module\ProducerModule;
use common\logic\Order\Order\Module\OrderModule;


$producerModule = ProducerModule::getInstance(); $producerModule = ProducerModule::getInstance();
$orderModule = OrderModule::getInstance(); $orderModule = OrderModule::getInstance();

+ 3
- 3
common/mail/orderConfirmProducer-html.php View File

termes. termes.
*/ */


use common\helpers\GlobalParam ;
use common\logic\Order\Order\Model\Order;
use common\logic\Order\Order\Module\OrderModule;
use common\helpers\GlobalParam;
use domain\Order\Order\Order;
use domain\Order\Order\OrderModule;
use yii\helpers\Html; use yii\helpers\Html;


$orderModule = OrderModule::getInstance(); $orderModule = OrderModule::getInstance();

+ 3
- 3
common/mail/orderConfirmProducer-text.php View File

termes. termes.
*/ */


use common\helpers\GlobalParam ;
use common\logic\Order\Order\Module\OrderModule;
use common\logic\Order\Order\Model\Order;
use common\helpers\GlobalParam;
use domain\Order\Order\Order;
use domain\Order\Order\OrderModule;
use yii\helpers\Html; use yii\helpers\Html;


$orderModule = OrderModule::getInstance(); $orderModule = OrderModule::getInstance();

+ 1
- 1
common/mail/paymentError-html.php View File

termes. termes.
*/ */


use common\logic\Producer\Producer\Module\ProducerModule;
use domain\Producer\Producer\ProducerModule;
use yii\helpers\Html; use yii\helpers\Html;


$producerModule = ProducerModule::getInstance(); $producerModule = ProducerModule::getInstance();

+ 1
- 1
common/mail/paymentErrorProducer-html.php View File

termes. termes.
*/ */


use common\logic\User\User\Module\UserModule;
use domain\User\User\UserModule;
use yii\helpers\Html; use yii\helpers\Html;


$userModule = UserModule::getInstance(); $userModule = UserModule::getInstance();

+ 1
- 1
common/mail/paymentErrorProducer-text.php View File

termes. termes.
*/ */


use common\logic\User\User\Module\UserModule;
use domain\User\User\UserModule;
use yii\helpers\Html; use yii\helpers\Html;


$userModule = UserModule::getInstance(); $userModule = UserModule::getInstance();

+ 1
- 1
common/mail/sendDocument-html.php View File

termes. termes.
*/ */


use domain\Document\Document\DocumentModule;
use yii\helpers\Html; use yii\helpers\Html;
use common\logic\Document\Document\Module\DocumentModule;


$documentModule = DocumentModule::getInstance(); $documentModule = DocumentModule::getInstance();



+ 1
- 1
common/mail/sendDocument-text.php View File

termes. termes.
*/ */


use common\logic\Document\Document\Module\DocumentModule;
use domain\Document\Document\DocumentModule;


$documentModule = DocumentModule::getInstance(); $documentModule = DocumentModule::getInstance();



+ 1
- 1
common/mail/signup-html.php View File

termes. termes.
*/ */


use domain\User\User\User;
use yii\helpers\Html; use yii\helpers\Html;
use common\logic\User\User\Model\User;


?> ?>



Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save