Main us

.env.example

@@ -130,3 +130,8 @@ SYNC_ES=
 SYNC_GB=
 
 CRM_URL=
+
+APIS_ENABLE_INPUT_LOG=true
+APIS_ENABLE_OUTPUT_LOG=true
+
+GOOGLE_PLACE_API_KEY=

.github/workflows/laravel.yml

@@ -123,6 +123,9 @@ jobs:
           cd ${{ secrets.WWW_DIR_4 }} && sudo git pull
           composer dump-autoload
           cd storage && sudo chmod -R 777 *
+          cd ${{ secrets.WWW_DIR_5 }} && sudo git pull
+          composer dump-autoload
+          cd storage && sudo chmod -R 777 *
     - name: Sync to Server 2 and Do it
       uses: appleboy/ssh-action@master
       env:
@@ -136,3 +139,25 @@ jobs:
           cd ${{ secrets.WWW_DIR_US }} && git pull
           composer dump-autoload
           cd storage && sudo chmod -R 777 *
+    - name: Sync to Server 3 and Do it
+      uses: appleboy/ssh-action@master
+      env:
+        GITHUB_SHA_X: ${GITHUB_SHA}
+      with:
+        host: ${{ secrets.SSH_HOST_EURO_2 }}  
+        username: ${{ secrets.SSH_USERNAME }}
+        key: ${{ secrets.DEPLOY_KEY }}
+        port: ${{secrets.SSH_PORT }}
+        script: |
+          cd ${{ secrets.WWW_DIR_EURO_2_1 }} && sudo git pull
+          composer dump-autoload
+          cd storage && sudo chmod -R 777 *
+          cd ${{ secrets.WWW_DIR_EURO_2_2 }} && sudo git pull
+          composer dump-autoload
+          cd storage && sudo chmod -R 777 *
+          cd ${{ secrets.WWW_DIR_EURO_2_3 }} && sudo git pull
+          composer dump-autoload
+          cd storage && sudo chmod -R 777 *
+          cd ${{ secrets.WWW_DIR_EURO_2_4 }} && sudo git pull
+          composer dump-autoload
+          cd storage && sudo chmod -R 777 *

.github/workflows/phpmd.yml

@@ -0,0 +1,63 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# PHPMD is a spin-off project of PHP Depend and
+# aims to be a PHP equivalent of the well known Java tool PMD.
+# What PHPMD does is: It takes a given PHP source code base
+# and look for several potential problems within that source.
+# These problems can be things like:
+#   Possible bugs
+#   Suboptimal code
+#   Overcomplicated expressions
+#   Unused parameters, methods, properties
+# More details at https://phpmd.org/
+
+name: PHPMD
+
+on:
+  push:
+    branches: [ "main_de" ]
+    paths-ignore:
+      - .github/**
+      - docs/**
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main_de" ]
+    paths-ignore:
+      - .github/**
+      - docs/**
+  schedule:
+    - cron: '26 22 * * 3'
+
+permissions:
+  contents: read
+
+jobs:
+  PHPMD:
+    name: Run PHPMD scanning
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read # for checkout to fetch code
+      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
+      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@aa1fe473f9c687b6fb896056d771232c0bc41161
+        with:
+          coverage: none
+          tools: phpmd
+
+      - name: Run PHPMD
+        run: phpmd . sarif codesize --reportfile phpmd-results.sarif
+        continue-on-error: true
+
+      - name: Upload analysis results to GitHub
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: phpmd-results.sarif
+          wait-for-processing: true

app/Providers/AppServiceProvider.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\URL;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -15,7 +16,9 @@ class AppServiceProvider extends ServiceProvider
   public function boot(): void
   {
     Schema::defaultStringLength(191);
-    //\Illuminate\Support\Facades\URL::forceScheme('https');
+    if ($this->app->environment('prod')) {
+      URL::forceScheme('https');
+    }
   }
 
   /**

app/Providers/RouteServiceProvider.php

@@ -42,7 +42,9 @@ public function boot(): void
     protected function configureRateLimiting(): void
     {
         RateLimiter::for('api', function (Request $request) {
-            return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
+            return Limit::perMinute(6000)->by($request->user()?->id ?: $request->ip())->response(function () {
+                return response()->json(['message' => 'Too Many Requests'], 429);
+            });
         });
     }
 }

composer.json

@@ -51,40 +51,42 @@
         "ext-pdo": "*",
         "ext-pdo_mysql": "*",
         "ext-tokenizer": "*",
-        "astrotomic\/laravel-translatable": "^11.0.0",
-        "barryvdh\/laravel-dompdf": "^2.0.0",
-        "cviebrock\/laravel-elasticsearch": "^10.0",
-        "diglactic\/laravel-breadcrumbs": "^8.0",
-        "doctrine\/dbal": "^3.0",
-        "dompdf\/dompdf": "2.0.8",
-        "enshrined\/svg-sanitize": "^0.18.0",
-        "guzzlehttp\/guzzle": "^7.0.1",
-        "intervention\/image": "^2.4",
-        "intervention\/imagecache": "^2.5.2",
-        "justinrainbow\/json-schema": "^5.2",
-        "kalnoy\/nestedset": "^6.0",
-        "khaled.alshamaa\/ar-php": "^6.0.0",
-        "konekt\/concord": "^1.2",
-        "laravel\/framework": "^10.0",
-        "laravel\/octane": "^2.0",
-        "laravel\/sanctum": "^3.2",
-        "laravel\/socialite": "^5.0",
-        "laravel\/tinker": "^2.0",
-        "laravel\/ui": "^4.0",
-        "maatwebsite\/excel": "^3.1.46",
-        "nexa-merchant\/apis": "dev-main",
-        "nexa-merchant\/apps": "1.0.0",
-        "nexa-merchant\/upselling": "^1.0",
-        "paypal\/paypal-checkout-sdk": "1.0.2",
-        "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-analytics": "^5.3",
-        "spatie\/laravel-responsecache": "^7.4",
-        "spatie\/laravel-sitemap": "^7.0"
+        "astrotomic/laravel-translatable": "^11.0.0",
+        "barryvdh/laravel-dompdf": "^2.0.0",
+        "cviebrock/laravel-elasticsearch": "^10.0",
+        "diglactic/laravel-breadcrumbs": "^8.0",
+        "doctrine/dbal": "^3.0",
+        "dompdf/dompdf": "2.0.8",
+        "enshrined/svg-sanitize": "^0.18.0",
+        "guzzlehttp/guzzle": "^7.0.1",
+        "intervention/image": "^2.4",
+        "intervention/imagecache": "^2.5.2",
+        "justinrainbow/json-schema": "^5.2",
+        "kalnoy/nestedset": "^6.0",
+        "khaled.alshamaa/ar-php": "^6.0.0",
+        "konekt/concord": "^1.2",
+        "laravel/framework": "^10.0",
+        "laravel/octane": "^2.0",
+        "laravel/sanctum": "^3.2",
+        "laravel/socialite": "^5.0",
+        "laravel/tinker": "^2.0",
+        "laravel/ui": "^4.0",
+        "maatwebsite/excel": "^3.1.46",
+        "nexa-merchant/apis": "2.0.2",
+        "nexa-merchant/apps": "^1.0",
+        "nexa-merchant/checkoutcod": "^1.1",
+        "nexa-merchant/googleplaces": "^1.0",
+        "nexa-merchant/upselling": "1.0.3",
+        "paypal/paypal-checkout-sdk": "1.0.2",
+        "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-analytics": "^5.3",
+        "spatie/laravel-responsecache": "^7.4",
+        "spatie/laravel-sitemap": "^7.0"
     },
     "require-dev": {
         "barryvdh\/laravel-debugbar": "^3.8",
@@ -206,4 +208,4 @@
         "source": "https:\/\/github.com\/xxl4\/NexaMerchant",
         "docs": "https:\/\/nexa-merchant.vercel.app"
     }
-}
+}

packages/Nicelizhi/Checkout/src/Resources/views/product-detail-checkoutv2.blade.php

@@ -26,6 +26,24 @@
   <?php } else { ?>
     <script src="https://checkout.airwallex.com/assets/elements.bundle.min.js"></script>
   <?php } ?>
+  <!-- Google Tag Manager -->
+  <script>
+    (function(w, d, s, l, i) {
+      w[l] = w[l] || [];
+      w[l].push({
+        'gtm.start': new Date().getTime(),
+        event: 'gtm.js'
+      });
+      var f = d.getElementsByTagName(s)[0],
+        j = d.createElement(s),
+        dl = l != 'dataLayer' ? '&l=' + l : '';
+      j.async = true;
+      j.src =
+        'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+      f.parentNode.insertBefore(j, f);
+    })(window, document, 'script', 'dataLayer', 'GTM-NS5CFS68');
+  </script>
+  <!-- End Google Tag Manager -->
   <style>
     @media only screen and (max-width: 600px) {}
 
@@ -1403,6 +1421,10 @@
 </head>
 
 <body>
+  <!-- Google Tag Manager (noscript) -->
+  <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NS5CFS68"
+      height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+  <!-- End Google Tag Manager (noscript) -->
   <page-builder-block>
     <link rel="stylesheet prefetch" href="/checkout/v2/css/app2.css?v=4" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Swiper/5.0.4/css/swiper.css" />

packages/Nicelizhi/Checkout/src/Resources/views/product-detail-checkoutv3.blade.php

@@ -92,7 +92,24 @@
   <noscript>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css">
   </noscript>
-
+  <!-- Google Tag Manager -->
+  <script>
+    (function(w, d, s, l, i) {
+      w[l] = w[l] || [];
+      w[l].push({
+        'gtm.start': new Date().getTime(),
+        event: 'gtm.js'
+      });
+      var f = d.getElementsByTagName(s)[0],
+        j = d.createElement(s),
+        dl = l != 'dataLayer' ? '&l=' + l : '';
+      j.async = true;
+      j.src =
+        'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+      f.parentNode.insertBefore(j, f);
+    })(window, document, 'script', 'dataLayer', 'GTM-NS5CFS68');
+  </script>
+  <!-- End Google Tag Manager -->
   <style>
     img {
       /* aspect-ratio: attr(width)/attr(height); */
@@ -139,16 +156,58 @@
     }
 
     .shopify-content {
-      width: 100%;
       float: left;
     }
 
+    .shopify-content {
+      max-width: 100%;
+      color: #555555;
+      font-size: 16px;
+      line-height: 1.5;
+      padding: 0 10px;
+    }
+
     .shopify-content img {
       width: 100% !important;
       margin: 0 auto;
+      border-radius: 10px;
       height: auto;
     }
 
+    .shopify-content h2 {
+      font-size: 18px;
+      color: #555555;
+      margin-bottom: 15px;
+    }
+
+    .shopify-content h3 {
+      font-size: 16px;
+      color: #555555;
+      margin-bottom: 15px;
+    }
+
+    .shopify-content p {
+      margin: 10px 0;
+    }
+
+    .shopify-content ul {
+      list-style: none;
+    }
+
+    .shopify-content ul li {
+      margin: 10px 0;
+    }
+
+    .shopify-content span {
+      display: inline-block;
+      margin-bottom: 3px;
+      width: 100%;
+    }
+
+    .shopify-content video {
+      width: 100%;
+    }
+
     .prod-name {
       word-wrap: break-word;
     }
@@ -325,6 +384,10 @@
 </head>
 
 <body>
+  <!-- Google Tag Manager (noscript) -->
+  <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NS5CFS68"
+      height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+  <!-- End Google Tag Manager (noscript) -->
   <div class="header-container">
     <div class="container">
       <div class="herder-content">