Merge a8001b3 into b710528

hiqdev · Jul 7, 2020 · 99ea79c · 99ea79c
2 parents b710528 + a8001b3
commit 99ea79c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/config/web.php b/config/web.php
@@ -30,17 +30,12 @@
             'class' => \hiqdev\yii2\cart\Module::class,
             'termsPage' => $params['organization.termsUrl'] ?: $params['organization.url'],
             'orderPage' => '/finance/cart/select',
-            /*'orderButton'    => function ($module) {
-                return Yii::$app->getView()->render('@hipanel/modules/finance/views/cart/order-button', [
-                    'module' => $module,
-                ]);
-            },*/
             'paymentMethods' => function () {
                 $merchants = Yii::$app->getModule('merchant')->getPurchaseRequestCollection(
                     new \hiqdev\yii2\merchant\models\DepositRequest(['amount' => 5])
                 )->getItems();
 
-                return Yii::$app->getView()->render('@hipanel/modules/finance/views/cart/payment-methods', [
+                return Yii::$app->getView()->render(dirname(__DIR__) . '/src/views/cart/payment-methods', [
                     'merchants' => $merchants,
                 ]);
             },
@@ -77,59 +72,59 @@
         ],
         'themeManager' => [
             'pathMap' => [
-                '@hipanel/modules/finance/views' => '$themedViewPaths',
+                dirname(__DIR__) . '/src/views' => '$themedViewPaths',
             ],
         ],
         'i18n' => [
             'translations' => [
                 'hipanel:finance' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/modules/finance/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
                 'hipanel:finance:change' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/modules/finance/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
                 'hipanel:finance:tariff' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/modules/finance/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
                 'hipanel.finance.units' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/modules/finance/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
                 'hipanel:finance:tariff:types' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/modules/finance/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                     'forceTranslation' => true,
                 ],
                 'hipanel:finance:deposit' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/modules/finance/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
                 'hipanel:finance:sale' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/modules/finance/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
                 'hipanel.finance.suggestionTypes' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/modules/finance/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
                 'hipanel.finance.price' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/modules/finance/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
                 'hipanel.finance.billTypes' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/modules/finance/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
                 'hipanel.finance.plan' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/modules/finance/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
                 'hipanel.finance.tariffprofile' => [
                     'class' => \yii\i18n\PhpMessageSource::class,
-                    'basePath' => '@hipanel/modules/finance/messages',
+                    'basePath' => dirname(__DIR__) . '/src/messages',
                 ],
             ],
         ],

diff --git a/src/assets/PriceEstimator.php b/src/assets/PriceEstimator.php
@@ -23,7 +23,7 @@ class PriceEstimator extends AssetBundle
     /**
      * @var string
      */
-    public $sourcePath = '@hipanel/modules/finance/assets/PriceEstimator';
+    public $sourcePath = __DIR__;
 
     /**
      * @var array

diff --git a/src/views/sale/view.php b/src/views/sale/view.php
@@ -42,7 +42,7 @@
 
         <?php if (Yii::$app->user->can('client.read') && Yii::$app->user->can('access-subclients')) : ?>
             <div class="row">
-                <?= $this->render('@hipanel/modules/ticket/views/ticket/_clientInfo', compact('client')); ?>
+                <?= $this->render('@vendor/hiqdev/hipanel-modules-ticket/srcviews/ticket/_clientInfo', compact('client')); ?>
             </div>
         <?php endif ?>
     </div>