Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6-c-customer

@@ -50,3 +50,8 @@ PUSHER_APP_CLUSTER=mt1
 
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+API_URL=https://sitefile.globalso.com/
+TRANSMIT_URL=https://hub.globalso.com/
+MERCHANT_NUMBER=
+SECRET_TOKEN=

@@ -116,7 +116,8 @@ function httpPost($url, $data, $header = [],$is_json = true)
             $header = array(
             $header = array(
                 "Accept: application/json",
                 "Accept: application/json",
                 "Content-Type:application/json;charset=utf-8",
                 "Content-Type:application/json;charset=utf-8",
-                "Token:".env("WEB_SITE_TOKEN")
+                "token:".env("SECRET_TOKEN"),
+                "pid:".env("MERCHANT_NUMBER")
             );
             );
         }
         }
         $ch = curl_init();
         $ch = curl_init();

+<?php
+
+use Illuminate\Contracts\Http\Kernel;
+use Illuminate\Http\Request;
+
+define('LARAVEL_START', microtime(true));
+/*
+|--------------------------------------------------------------------------
+| Check If The Application Is Under Maintenance
+|--------------------------------------------------------------------------
+|
+| If the application is in maintenance / demo mode via the "down" command
+| we will load this file so that any pre-rendered content can be shown
+| instead of starting the framework, which could cause an exception.
+|
+*/
+
+if (file_exists($maintenance = __DIR__.'/../storage/framework/maintenance.php')) {
+    require $maintenance;
+}
+
+/*
+|--------------------------------------------------------------------------
+| Register The Auto Loader
+|--------------------------------------------------------------------------
+|
+| Composer provides a convenient, automatically generated class loader for
+| this application. We just need to utilize it! We'll simply require it
+| into the script here so we don't need to manually load our classes.
+|
+*/
+
+require __DIR__.'/../vendor/autoload.php';
+
+/*
+|--------------------------------------------------------------------------
+| Run The Application
+|--------------------------------------------------------------------------
+|
+| Once we have the application, we can handle the incoming request using
+| the application's HTTP kernel. Then, we will send the response back
+| to this client's browser, allowing them to enjoy our application.
+|
+*/
+
+$app = require_once __DIR__.'/../bootstrap/app.php';
+
+$kernel = $app->make(Kernel::class);
+
+$response = $kernel->handle(
+    $request = Request::capture()
+)->send();
+
+$kernel->terminate($request, $response);

+location / {
+  try_files $uri $uri/ /index.php?$query_string;
+  }