sync main to lp package branche

.env.example

@@ -86,4 +86,23 @@ SHOPIFY_APP_HOST_NAME=
 
 
 APP_TIMEZONE=Asia/Shanghai
-DB_TIMEZONE=+08:00
+DB_TIMEZONE=+08:00
+
+ONEBUY_DEFAULT_COUNTRY=DE
+ONEBUY_BRAND=
+ONEBUY_DEFAULT_LANG=DE
+ONEBUY_GTAG=
+
+SHOPIFY_APP_ID=
+SHOPIFY_STORE_LANG=en
+
+ONEBUY_PAYMENT_AIRWALLEX_KLARNA=0
+ONEBUY_PAYMNET_PAYAL_STANDARD=1
+ONEBUY_PAYMENT_AIRWALLEX_CREDIT_CARD=1
+ONEBUY_PAYMENT_DEFAULT=payment_method_airwallex
+
+WCOME_NOTICLE_URL=
+
+FB_IDS=
+
+OB_ADV_ID=

.github/workflows/laravel.yml

@@ -1,16 +1,17 @@
-name: Laravel
+name: Prod
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main","main_de","main_us" ]
+    paths-ignore:
+      - .github/**
+      - docs/**
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main","main_de","main_us" ]
 
 jobs:
   laravel-tests:
-
     runs-on: ubuntu-latest
-
     container:
       image: kirschbaumdevelopment/laravel-test-runner:8.1
     services:
@@ -30,8 +31,8 @@ jobs:
     - uses: actions/checkout@v3
     - name: Copy .env
       run: php -r "file_exists('.env') || copy('.env.example', '.env');"
-    - name: Install Dependencies
-      run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+    - name: composer update
+      run: composer update
     - name: Directory Permissions
       run: chmod -R 777 storage bootstrap/cache
     - name: Generate key
@@ -48,4 +49,34 @@ jobs:
         DB_DATABASE: test
         DB_USERNAME: root
         DB_PASSWORD: password
-      run: php artisan migrate && php artisan db:seed && vendor/bin/pest
+      run: php artisan migrate && php artisan db:seed
+    - name: Sync to Server 1 and Do it
+      uses: appleboy/ssh-action@master
+      env:
+        GITHUB_SHA_X: ${GITHUB_SHA}
+      with:
+        host: ${{ secrets.SSH_HOST }}  
+        username: ${{ secrets.SSH_USERNAME }}
+        key: ${{ secrets.DEPLOY_KEY }}
+        port: ${{secrets.SSH_PORT }}
+        script: |
+          cd ${{ secrets.WWW_DIR }} && sudo git pull
+          vendor/bin/pest
+          cd ${{ secrets.WWW_DIR_2 }} && sudo git pull
+          vendor/bin/pest
+          cd ${{ secrets.WWW_DIR_3 }} && sudo git pull
+          vendor/bin/pest
+          cd ${{ secrets.WWW_DIR_4 }} && sudo git pull
+          vendor/bin/pest
+    - name: Sync to Server 2 and Do it
+      uses: appleboy/ssh-action@master
+      env:
+        GITHUB_SHA_X: ${GITHUB_SHA}
+      with:
+        host: ${{ secrets.SSH_HOST_US }}  
+        username: ${{ secrets.SSH_USERNAME_US }}
+        key: ${{ secrets.DEPLOY_KEY_US }}
+        port: ${{secrets.SSH_PORT_US }}
+        script: |
+          cd ${{ secrets.WWW_DIR_US }} && git pull
+          vendor/bin/pest

.github/workflows/laravel_dev.yaml

@@ -0,0 +1,66 @@
+name: Dev
+
+on:
+  push:
+    branches: [ "develop" ]
+    paths-ignore:
+      - .github/**
+      - docs/**
+  pull_request:
+    branches: [ "develop" ]
+
+jobs:
+  laravel-tests:
+    runs-on: ubuntu-latest
+    container:
+      image: kirschbaumdevelopment/laravel-test-runner:8.1
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ROOT_PASSWORD: password
+          MYSQL_DATABASE: test
+        ports:
+          - 33306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    steps:
+    - uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
+      with:
+        php-version: '8.1'
+    - uses: actions/checkout@v3
+    - name: Copy .env
+      run: php -r "file_exists('.env') || copy('.env.example', '.env');"
+    - name: composer update
+      run: composer update
+    - name: Directory Permissions
+      run: chmod -R 777 storage bootstrap/cache
+    - name: Generate key
+      run: php artisan key:generate
+    - name: Create Database
+      run: |
+        mkdir -p database
+        touch database/database.sqlite
+    - name: Execute tests (Unit and Feature tests) via pest
+      env:
+        DB_CONNECTION: mysql
+        DB_HOST: mysql
+        DB_PORT: 3306
+        DB_DATABASE: test
+        DB_USERNAME: root
+        DB_PASSWORD: password
+      run: php artisan migrate && php artisan db:seed
+    - name: Sync to Server 1 and Do it
+      uses: appleboy/ssh-action@master
+      env:
+        GITHUB_SHA_X: ${GITHUB_SHA}
+      with:
+        host: ${{ secrets.SSH_HOST }}  
+        username: ${{ secrets.SSH_USERNAME }}
+        key: ${{ secrets.DEPLOY_KEY }}
+        port: ${{secrets.SSH_PORT }}
+        script: |
+          cd ${{ secrets.WWW_DEV_DIR }} && sudo git pull
+          composer update
+          php artisan migrate && php artisan db:seed
+          vendor/bin/pest

.github/workflows/phpmd.yml

@@ -18,9 +18,15 @@ name: PHPMD
 on:
   push:
     branches: [ "main" ]
+    paths-ignore:
+      - .github/**
+      - docs/**
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ "main" ]
+    paths-ignore:
+      - .github/**
+      - docs/**
   schedule:
     - cron: '26 22 * * 3'
 

.gitignore

@@ -21,6 +21,7 @@ package-lock.json
 /public/hot
 /public/storage
 /public/vendor
+/public/*
 /lang/vendor
 /storage/*.key
 /storage/dcc-data/

README.md

@@ -1 +1 @@
-# Bagisto Laravel ecommerce
+# Nexa Merchant Laravel ecommerce

app/Console/Kernel.php

@@ -24,8 +24,11 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        $schedule->command('invoice:cron')->dailyAt('3:00');
-        $schedule->command('product:index --type=price')->dailyAt('24:00');
+        # $schedule->command('invoice:cron')->dailyAt('3:00');
+        # $schedule->command('product:index --type=price')->dailyAt('23:59');
+        $schedule->command('shopify:order:post')->everyFiveMinutes()->withoutOverlapping(); // post order to shopify
+        $schedule->command('shopify:order:get --force=true')->hourly()->withoutOverlapping()->timezone('Asia/Shanghai')->between('9:00', '19:00'); // shopify order sync
+        $schedule->command('shopify:order:get:shipped --force=true')->hourly()->withoutOverlapping()->timezone('Asia/Shanghai')->between('9:00', '19:00'); // shopify order sync
     }
 
     /**

composer.json

@@ -23,7 +23,7 @@
         "diglactic/laravel-breadcrumbs": "^8.0",
         "doctrine/dbal": "^3.0",
         "dompdf/dompdf": "2.0.4",
-        "enshrined/svg-sanitize": "^0.16.0",
+        "enshrined/svg-sanitize": "^0.18.0",
         "guzzlehttp/guzzle": "^7.0.1",
         "intervention/image": "^2.4",
         "intervention/imagecache": "^2.5.2",
@@ -42,13 +42,13 @@
         "predis/predis": "^2.2",
         "prettus/l5-repository": "^2.6",
         "pusher/pusher-php-server": "^7.0",
+        "rap2hpoutre/laravel-log-viewer": "^2.3",
         "shetabit/visitor": "^4.1",
         "shopify/shopify-api": "^5.2",
         "spatie/laravel-responsecache": "^7.4",
         "spatie/laravel-sitemap": "^7.0"
     },
     "require-dev": {
-        "bagisto/laravel-datafaker": "^2.0@alpha",
         "barryvdh/laravel-debugbar": "^3.8",
         "fakerphp/faker": "^1.9.1",
         "laravel/pint": "^1.8",
@@ -91,12 +91,14 @@
             "Webkul\\SocialShare\\": "packages/Webkul/SocialShare/src",
             "Webkul\\Tax\\": "packages/Webkul/Tax/src",
             "Webkul\\Theme\\": "packages/Webkul/Theme/src",
-            "Nicelizhi\\OneBuy\\": "packages/Webkul/OneBuy/src",
+            "Nicelizhi\\OneBuy\\": "packages/Nicelizhi/OneBuy/src",
             "Nicelizhi\\Airwallex\\": "packages/Webkul/Airwallex/src",
             "Nicelizhi\\Shopify\\": "packages/Nicelizhi/Shopify/src",
+            "Nicelizhi\\ShopLine\\": "packages/Nicelizhi/ShopLine/src",
             "Nicelizhi\\Admin\\": "packages/Nicelizhi/Admin/src",
             "Nicelizhi\\Checkout\\": "packages/Nicelizhi/Checkout/src",
             "Nicelizhi\\Lp\\": "packages/Nicelizhi/Lp/src",
+            "Nicelizhi\\Binom\\": "packages/Nicelizhi/Binom/src",
             "Webkul\\User\\": "packages/Webkul/User/src"
         }
     },
@@ -107,7 +109,10 @@
             "Webkul\\DataGrid\\Tests\\": "packages/Webkul/DataGrid/tests",
             "Webkul\\Shop\\Tests\\": "packages/Webkul/Shop/tests",
             "Nicelizhi\\Checkout\\Tests\\": "packages/Nicelizhi/Checkout/tests",
-            "Nicelizhi\\Shopify\\Tests\\": "packages/Nicelizhi/Shopify/tests"
+            "Nicelizhi\\Binom\\Tests\\": "packages/Nicelizhi/Binom/tests",
+            "Nicelizhi\\Shopify\\Tests\\": "packages/Nicelizhi/Shopify/tests",
+            "Nicelizhi\\OneBuy\\Tests\\": "packages/Nicelizhi/OneBuy/tests",
+            "Nicelizhi\\ShopLine\\Tests\\": "packages/Nicelizhi/ShopLine/tests"
         }
     },
     "scripts": {