diff --git a/.env-example b/.env-example new file mode 100644 index 00000000..4271cefe --- /dev/null +++ b/.env-example @@ -0,0 +1,80 @@ +APP_NAME=IZYIM +APP_ENV=local +APP_KEY=base64:Fu2YulXExzm9HJ5LgVmZUmcbRkchHkc82q02MorN5GQ= +APP_DEBUG=true +APP_URL=http://localhost + +LOG_CHANNEL=stack + +DB_CONNECTION=mysql +DB_HOST=mysql +DB_PORT=3306 +DB_DATABASE=default +DB_USERNAME=default +DB_PASSWORD=secret + +BROADCAST_DRIVER=log +CACHE_DRIVER=file +SESSION_DRIVER=file +SESSION_LIFETIME=120 +QUEUE_DRIVER=sync + +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_DRIVER=smtp +MAIL_HOST=smtp.mailtrap.io +MAIL_PORT=2525 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null + +PUSHER_APP_ID= +PUSHER_APP_KEY= +PUSHER_APP_SECRET= +PUSHER_APP_CLUSTER=mt1 + +MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" +MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" +APP_NAME=exchange +APP_ENV=local +APP_KEY=base64:Fu2YulXExzm9HJ5LgVmZUmcbRkchHkc82q02MorN5GQ= +APP_DEBUG=true +APP_URL=http://localhost + +LOG_CHANNEL=stack + +DB_CONNECTION=mysql +DB_HOST=mysql +DB_PORT=3306 +DB_DATABASE=default +DB_USERNAME=default +DB_PASSWORD=secret + +BROADCAST_DRIVER=log +CACHE_DRIVER=file +SESSION_DRIVER=file +SESSION_LIFETIME=120 +QUEUE_DRIVER=sync + +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_DRIVER=smtp +MAIL_HOST=smtp.mailtrap.io +MAIL_PORT=2525 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null + +PUSHER_APP_ID= +PUSHER_APP_KEY= +PUSHER_APP_SECRET= +PUSHER_APP_CLUSTER=mt1 + +MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" +MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" + +JWT_SECRET=FwYZ3SPFgjpEDqAwcaSIV6eEmQiMtGWt \ No newline at end of file diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index b9b81f2e..5aae8aee 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -770,20 +770,19 @@ class BookingController extends Controller public function adminShowCompletedOrders() { - $bookings = Booking::select('id', 'company_name','company_address','created_at','rate','amount', 'rmb_book_amount', 'admin_status') + $bookings = Booking::select('id','created_at','user_id','rate','amount', 'bia', 'admin_status') ->where('admin_status', 7) ->orderBy('id', 'desc') ->get(); foreach ($bookings as $booking) { $booking->id; - $booking->company_name; - $booking->company_address; $booking->created_at; + $booking->marking = $booking->user->marking; $booking->rate; $booking->amount; - $booking->rmb_book_amount; - $booking->admin_status; + $booking->bia; + $booking->admin_status = "(". $booking->admin_status ."/7)";; } return $bookings; } diff --git a/readme.md b/readme.md index e4f0893d..b67d5296 100644 --- a/readme.md +++ b/readme.md @@ -19,11 +19,11 @@ ## Installation - `git clone git@gitlab.com:CIEFWorldwideSdnBhd/exchange.git` +- `cd` in your working folder - Copy `.env-example` to `.env` -- Edit `.env` and set your database connection details -- `Comp` run `php artisan key:generate` and `php artisan jwt:secret`) -- `php artisan migrate` -- `yarn` / `npm install` +- Run `docker-compose up` +- Open another git bash run `yarn install` +- Run `yarn run watch` ## Usage diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue index 822dfcb4..4a0d4872 100644 --- a/resources/assets/js/components/LocaleDropdown.vue +++ b/resources/assets/js/components/LocaleDropdown.vue @@ -13,24 +13,31 @@ --> - +
  • + + {{ $t('Transaction History') }} + +
    • +
  • + + {{ $t('Completed Orders') }} + +
    • diff --git a/resources/assets/js/components/Navbar.vue b/resources/assets/js/components/Navbar.vue index d71585cd..ccbabb91 100644 --- a/resources/assets/js/components/Navbar.vue +++ b/resources/assets/js/components/Navbar.vue @@ -10,7 +10,7 @@