From ed80b25b858d6d9cb3aa4e8db8898a4067afc94b Mon Sep 17 00:00:00 2001 From: Kevin Adametz Date: Thu, 7 Feb 2019 16:25:02 +0100 Subject: [PATCH] last from 01 2019 --- .env | 4 +- .idea/.name | 2 +- .idea/deployment.xml | 2 +- .idea/{_crm.iml => mein.sterntours.iml} | 0 .idea/modules.xml | 2 +- .idea/workspace.xml | 688 +++++++++--------- app/Http/Controllers/API/DraftController.php | 90 +++ app/Http/Controllers/BookingController.php | 7 + app/Http/Controllers/DraftController.php | 1 + .../Settings/TravelCountryController.php | 65 ++ app/Models/BookingDraftItem.php | 23 + app/Models/DraftItem.php | 17 + app/Models/DraftType.php | 2 +- ..._10_19_114521_create_draft_items_table.php | 3 + ...93339_create_booking_draft_items_table.php | 2 + public/js/custom.js | 2 +- resources/views/booking/detail.blade.php | 25 +- .../layouts/includes/layout-sidenav.blade.php | 23 +- routes/web.php | 9 + 19 files changed, 626 insertions(+), 341 deletions(-) rename .idea/{_crm.iml => mein.sterntours.iml} (100%) create mode 100755 app/Http/Controllers/Settings/TravelCountryController.php diff --git a/.env b/.env index 5f2c5c9..6d449db 100755 --- a/.env +++ b/.env @@ -2,8 +2,8 @@ APP_NAME="STERN TOURS CRM" APP_ENV=local APP_KEY=base64:cxq+xNckU1xLwp8V9Bfj9+nOK5iZL6urcZ1EBO8usXg= APP_DEBUG=true -APP_URL=http://crm-stern-tours.local -APP_OLD_URL = http://cms-stern-tours.local +APP_URL=http://mein.sterntours.local +APP_OLD_URL = http://mein.sterntours.local #APP_URL_V2=https://v2.stern-tours.de APP_URL_V2=http://v2-sterntours.local diff --git a/.idea/.name b/.idea/.name index e842fd0..b04698a 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -_crm \ No newline at end of file +mein.sterntours \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml index 5ee7a0b..7688ec4 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/.idea/_crm.iml b/.idea/mein.sterntours.iml similarity index 100% rename from .idea/_crm.iml rename to .idea/mein.sterntours.iml diff --git a/.idea/modules.xml b/.idea/modules.xml index 9eb3d39..1ccbf38 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 19b157d..6fd4d48 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,19 +2,25 @@ + + + + + - - - + + + + + + - - - - + + @@ -41,15 +47,15 @@ - - + + - + @@ -57,19 +63,19 @@ - - - + + + - + - - - + + + @@ -77,104 +83,128 @@ - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -189,6 +219,9 @@ translations draft version + selectpicker + travel_pr + modi @@ -205,15 +238,11 @@ @@ -383,10 +416,10 @@ - @@ -399,13 +432,8 @@ - - - - - - - + +