Merge branch 'fix/slice-error' into 'master'

Fix/slice error

See merge request CIEFWorldwideSdnBhd/exchange!115

.gitlab-ci.yml

@@ -27,7 +27,7 @@ staging:
     - chmod 400 ~/.ssh/id_rsa
     - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
   script:
-    - ssh izyim@40.76.84.105 "cd exchange && git pull origin master && sudo docker-compose -f docker-prod.yml build && sudo docker-compose -f docker-prod.yml up -d"
+    - ssh izyim@40.76.84.105 "cd exchange && git pull origin master && sudo docker-compose -f docker-prod.yml up -d"
   environment:
     name: staging
     url: https://exchange-staging.izyim.com/

app/Http/Controllers/BookingController.php

@@ -82,6 +82,7 @@ class BookingController extends Controller
     public function userComplete(){
 		$user = Auth::user();
         $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
+                                    ->where('user_id', Auth::user()->id)
                                     ->where('status', '=', '7')
                                     ->orderby('updated_at','desc')
                                     ->paginate(10);

caddy/Caddyfile

@@ -1,4 +1,5 @@
 https://exchange-staging.izyim.com {
+    proxy /phpmyadmin  127.0.0.1:8090
     root /var/www/public
     
     fastcgi / 127.0.0.1:9000 php {

caddy/Dockerfile

@@ -13,7 +13,6 @@ RUN curl --silent --show-error --fail --location \
 COPY Caddyfile /etc/Caddyfile
 
 WORKDIR /var/www
-ADD ../storage/app/public .
 RUN ln -sf /var/www/storage/app/public /var/www/public/storage
 
 CMD ["/usr/bin/caddy", "--conf", "/etc/Caddyfile", "--log", "stdout"]

docker-prod.yml

@@ -67,5 +67,16 @@ services:
   cache:
     image: redis:3.0-alpine
 
+  phpmyadmin:
+    depends_on:
+      - mysql
+    image: phpmyadmin/phpmyadmin
+    restart: always
+    ports:
+      - 8090:80
+    environment:
+      PMA_HOST: mysql
+      MYSQL_ROOT_PASSWORD: root
+
 volumes:
   dbdata: