fix conflict

.drone.yml

@@ -33,9 +33,12 @@ steps:
   - name: deploy to staging
     commands:
       - cd /apps/willaengine-staging/ ; docker-compose up -d
-      - docker exec willaengine-staging_php bash -c "COMPOSER=composer-staging.json composer update wm/common"
+      # - docker exec willaengine-staging_php bash -c "COMPOSER=composer-staging.json composer update wm/common"
       - docker exec willaengine-staging_php bash -c "COMPOSER=composer-staging.json composer update"
-      # - docker exec willaengine-staging_php service supervisor start 
+      - docker exec willaengine-staging_php bash -c "php artisan route:clear"
+       - docker exec willaengine-staging_php bash -c "php artisan route:cache"
+      # - docker exec willaengine-staging_php service supervisor start
+      # - docker exec willaengine-staging_php service supervisor start
       # - docker exec willaengine-staging_php bash -c "php artisan db:seed --class=CalculationMethodSeeder"
       # - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations
       # - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations

Jenkinsfile

@@ -39,3 +39,4 @@ pipeline {
         IMAGE_NAME = 'willaengine'
     }
 }
+

composer.json

@@ -89,7 +89,7 @@
     "repositories": [
         {
             "type": "path",
-            "url": "./modules/wm-crm"
+            "url": "./modules/crm"
         },
         {
             "type": "path",

resources/lang/fa/validation.php

@@ -36,7 +36,7 @@ return [
     "digits"           => ":attribute باید :digits رقم باشد.",
     "digits_between"   => ":attribute باید بین :min و :max رقم باشد.",
     "email"            => "فرمت :attribute معتبر نیست.",
-    "exists"           => "این  :attribute  وجود دارد.",
+    "exists"           => "این  :attribute  معتبر نمی باشد.",
     "image"            => ":attribute باید تصویر باشد.",
     "in"               => ":attribute انتخاب شده، معتبر نیست.",
     "integer"          => ":attribute باید نوع داده ای عددی  باشد.",

worker.conf

@@ -17,6 +17,28 @@ user=www-data
 redirect_stderr=true
 stdout_logfile=/var/log/supervisor/scheduler.log
 
+[program:change-store-order-status]
+command=php /var/www/html/artisan queue:work redis --queue=change_to_successful_store_order --tries=3
+process_name=%(program_name)s_%(process_num)02d
+autostart=true
+autorestart=true
+user=www-data
+numprocs=3
+redirect_stderr=true
+stdout_logfile=/var/log/supervisor/change-store-order-status.log
+
+
+[program:change-store-order-status]
+command=php /var/www/html/artisan queue:work redis --queue=create_store_product --tries=3
+process_name=%(program_name)s_%(process_num)02d
+autostart=true
+autorestart=true
+user=www-data
+numprocs=3
+redirect_stderr=true
+stdout_logfile=/var/log/supervisor/sms-status.log
+
+
 # [program:check-sms-status]
 # command=php /var/www/html/artisan queue:work redis --queue=check-sms-status --tries=3
 # process_name=%(program_name)s_%(process_num)02d