Merge branch 'dillon/149-fix-jenkins-deployment-issue' into vapor/development

.gitignore

@@ -22,7 +22,6 @@ gox.iml
 rebuild_docker.sh
 docker/*
 db/*
-package-lock.json
 public/*
 /public/*
 /storage/app/public

docker-setup/docker-compose.yml

@@ -7,7 +7,7 @@ services:
   #################################################################
   nginx:
     image: nginx:stable-alpine
-    container_name: exchange-2-ngnix
+    container_name: exchange-ngnix
     ports:
       - "8082:80"
     volumes:
@@ -21,7 +21,7 @@ services:
   #################################################################
   mysql:
     image: mysql:5.7.29
-    container_name: exchange-2-mysql
+    container_name: exchange-mysql
     restart: unless-stopped
     tty: true
     ports:
@@ -42,7 +42,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    container_name: exchange-2-php
+    container_name: exchange-php
     volumes:
       - ../:/var/www/html
       - ./php/default.conf:/usr/local/etc/php-fpm.d/zz-docker.conf

resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue

@@ -204,7 +204,7 @@
                     <div class="row m-b-15" v-if="$store.getters.isAdmin && data.purchase_order.status === 2" >
                         <div class="col">
                             <button class="btn btn-sm btn-block btn-success b-rad-none" :disabled="poProcessing" @click="handleRepprove()">
-                                Repprove Purchase Order
+                                Reapprove Purchase Order
                                 <span class="badge badge-danger position-absolute" style="top:-5px; right:-5px;"
                                     data-toggle="tooltip"
                                     data-placement="right"