updated js & css

remove console.logs
use new zip code API (old one is deprecated)
2023-12-20 23:13:49 +01:00 · 2023-12-20 23:08:03 +01:00 · 2023-12-20 22:51:14 +01:00 · 2023-12-20 22:49:10 +01:00 · 2023-12-20 22:48:22 +01:00 · 2023-10-19 15:35:03 +02:00
22 changed files with 11183 additions and 13563 deletions
--- a/.env.example
+++ b/.env.example
@ -1,8 +1,11 @@
 APP_NAME="Your SwissCar GmbH - AutoManager"
 APP_ENV=local
-APP_KEY=
 APP_DEBUG=true
 APP_URL=http://automngr.test
+APP_PORT=80
+
+USER_1_EMAIL=test@salloum.pm
+USER_1_PW=abc123

 LOG_CHANNEL=stack
 LOG_LEVEL=debug
@ -11,8 +14,9 @@ DB_CONNECTION=mysql
 DB_HOST=mysql
 DB_PORT=3306
 DB_DATABASE=automngr
-DB_USERNAME=sail
-DB_PASSWORD=password
+DB_USERNAME="sail"
+DB_PASSWORD="password"
+FORWARD_DB_PORT=3306

 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@ -0,0 +1,53 @@
+name: PHP Composer
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate --strict
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v3
+      with:
+        path: vendor
+        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-php-
+
+    - name: Install dependencies
+      run: composer install --prefer-dist --no-progress
+
+    - name: Setup Node
+      uses: actions/setup-node@v1
+      with:
+       node-version: '10.x'
+
+    - name: Install Dependencies
+      run: npm install
+
+    - name: Build
+      run: npm run build --if-present
+
+    - name: Laravel mix
+      run: mix --production
+
+    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
+    # Docs: https://getcomposer.org/doc/articles/scripts.md
+
+    # - name: Run test suite
+    #   run: composer run-script test
--- a/README.md
+++ b/README.md
@ -11,9 +11,16 @@ Running on Laravel 8

 Prerequisites: 
 - [Docker](https://docker.com) installed and running
+- Docker compose installed
+- Composer installed
+- PHP installed

 Steps:
 1. copy .env.example to .env
+2. add user credentials in .env
+2. run `composer update --ignore-platform-reqs`
+3. run `composer install --ignore-platform-reqs`
+1. run `./vendor/bin/sail php artisan key:generate`
 2. start app by running `./vendor/bin/sail up` inside the main directory (or configure a bash alias: `alias sail='bash vendor/bin/sail'`) then you can use `sail up`
 3. Run migrations and seed db: `sail php artisan migrate:fresh --seed`
 4. `sail npm run watch`
--- a/app/Enums/InsuranceType.php
+++ b/app/Enums/InsuranceType.php
@ -24,4 +24,6 @@ final class InsuranceType extends Enum
    const FiveStar = '4';

    const FiveStarPlus = '5';
+
+    const Ja = '6';
 }
--- a/app/Http/Controllers/CarController.php
+++ b/app/Http/Controllers/CarController.php
@ -73,10 +73,10 @@ class CarController extends Controller
                    'known_damage' => $car->known_damage,
                    'seller' =>  $bcontract ? $bcontract->contact->full_title : null,
                    'buy_date' =>  $bcontract ? $bcontract->date_formatted : null,
-                    'price' => $bcontract ? $bcontract->price : null,
+                    'price' => $bcontract ? $bcontract->price_for_excel : null,
                    'buyer' =>  $scontract ? $scontract->contact->full_title : null,
                    'sell_date' =>  $scontract ? $scontract->date_formatted : null,
-                    'sell_price' => $scontract ? $scontract->price : null,
+                    'sell_price' => $scontract ? $scontract->price_for_excel : null,
                ];
            });

@ -122,7 +122,7 @@ class CarController extends Controller
                    'known_damage' => $car->known_damage,
                    'seller' =>  $contract ? $contract->contact->full_title : null,
                    'buy_date' =>  $contract ? $contract->date_formatted : null,
-                    'price' => $contract ? $contract->price : null,
+                    'price' => $contract ? $contract->price_for_excel : null,
                ];
            });

@ -172,10 +172,10 @@ class CarController extends Controller
                    'known_damage' => $car->known_damage,
                    'seller' =>  $bcontract ? $bcontract->contact->full_title : null,
                    'buy_date' =>  $bcontract ? $bcontract->date_formatted : null,
-                    'price' => $bcontract ? $bcontract->price : null,
+                    'price' => $bcontract ? $bcontract->price_for_excel : null,
                    'buyer' =>  $scontract ? $scontract->contact->full_title : null,
                    'sell_date' =>  $scontract ? $scontract->date_formatted : null,
-                    'sell_price' => $scontract ? $scontract->price : null,
+                    'sell_price' => $scontract ? $scontract->price_for_excel : null,
                ];
            });

--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@ -2,7 +2,7 @@

 namespace App\Http\Middleware;

-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;

 class TrustProxies extends Middleware
@ -19,5 +19,9 @@ class TrustProxies extends Middleware
     *
     * @var int
     */
-    protected $headers = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB;
-}
+    protected $headers =
+        Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;}
--- a/app/Models/Contract.php
+++ b/app/Models/Contract.php
@ -78,6 +78,7 @@ class Contract extends Model
            InsuranceType::ThreeStar => '3 Stern',
            InsuranceType::FiveStar => '5 Stern',
            InsuranceType::FiveStarPlus => '5 Stern+',
+            InsuranceType::Ja => 'Ja',
            default => 'Nein',
        };
    }
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@ -42,19 +42,25 @@ class Payment extends Model

    public function getTypeAttribute($type)
    {
-        return match ($type) {
-            PaymentType::Transaction() => 'Banküberweisung',
-            PaymentType::Cash() => 'Barzahlung',
-            default => 'Überweisung via Cembra',
+        switch ($type) {
+            case PaymentType::Transaction():
+                return 'Banküberweisung';
+            case PaymentType::Cash():
+                return 'Barzahlung';
+            default:
+                return 'Überweisung via Cembra';
        }; 
    }

    public function getTypeTextAttribute()
    {
-        return match ($this->type) {
-            'Banküberweisung' => 'via Banküberweisung erhalten',
-            'Barzahlung' => 'in bar erhalten',
-            default => 'via Cembra-Überweisung erhalten',
+        switch ($this->type) {
+            case 'Banküberweisung':
+                return 'via Banküberweisung erhalten';
+            case 'Barzahlung':
+                return 'in bar erhalten';
+            default:
+                return 'via Cembra-Überweisung erhalten';
        }; 
    }

--- a/composer.json
+++ b/composer.json
@ -2,31 +2,33 @@
    "name": "laravel/laravel",
    "type": "project",
    "description": "The Laravel Framework.",
-    "keywords": ["framework", "laravel"],
+    "keywords": [
+        "framework",
+        "laravel"
+    ],
    "license": "MIT",
    "require": {
-        "php": "^7.3|^8.0",
-        "barryvdh/laravel-dompdf": "^0.9.0",
-        "bensampo/laravel-enum": "^3.3",
-        "cknow/laravel-money": "^6.1",
-        "fakerphp/faker": "^1.14",
-        "fideloper/proxy": "^4.4",
+        "php": "^8.1",
+        "barryvdh/laravel-dompdf": "^1.0",
+        "bensampo/laravel-enum": "^5.1",
+        "cknow/laravel-money": "^7.0",
+        "fakerphp/faker": "^1.9.1",
        "fruitcake/laravel-cors": "^2.0",
        "guzzlehttp/guzzle": "^7.0.1",
-        "inertiajs/inertia-laravel": "^0.3.5",
-        "laravel/framework": "^8.12",
+        "inertiajs/inertia-laravel": "^0.5",
+        "laravel/framework": "^9.0",
        "laravel/jetstream": "^2.3",
        "laravel/sanctum": "^2.6",
        "laravel/tinker": "^2.5",
        "maatwebsite/excel": "^3.1",
-        "phpoffice/phpword": "^0.18.2",
+        "phpoffice/phpword": "^0.18",
        "tightenco/ziggy": "^1.0"
    },
    "require-dev": {
-        "facade/ignition": "^2.5",
+        "spatie/laravel-ignition": "^1.0",
        "laravel/sail": "^1.0.1",
        "mockery/mockery": "^1.4.2",
-        "nunomaduro/collision": "^5.0",
+        "nunomaduro/collision": "^6.1",
        "phpunit/phpunit": "^9.3.3"
    },
    "autoload": {
--- a/composer.lock
+++ b/composer.lock
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@ -36,20 +36,20 @@ class DatabaseSeeder extends Seeder

        User::factory()->create([
            'name' => 'Nadim Salloum',
-            'email' => env('USER_1_EMAIL'),
-            'password' => bcrypt(env('USER_1_PW')),
+            'email' => env('USER_1_EMAIL', 'test@test.ch'),
+            'password' => bcrypt(env('USER_1_PW', 'abc123')),
        ]);

        User::factory()->create([
            'name' => 'Mohamad Salloum',
-            'email' => env('USER_2_EMAIL'),
-            'password' => bcrypt(env('USER_2_PW')),
+            'email' => env('USER_2_EMAIL', 'test2@test.ch'),
+            'password' => bcrypt(env('USER_2_PW', 'abc123')),
        ]);

        User::factory()->create([
            'name' => 'Nadim Salloum',
-            'email' => env('USER_3_EMAIL'),
-            'password' => bcrypt(env('USER_3_PW')),
+            'email' => env('USER_3_EMAIL', 'test3@test.ch'),
+            'password' => bcrypt(env('USER_3_PW', 'abc123')),
        ]);

        foreach ($this->getBrands() as $brandItem) {
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -3,11 +3,11 @@ version: '3'
 services:
    laravel.test:
        build:
-            context: ./vendor/laravel/sail/runtimes/8.0
+            context: ./vendor/laravel/sail/runtimes/8.1
            dockerfile: Dockerfile
            args:
                WWWGROUP: '${WWWGROUP}'
-        image: sail-8.0/app
+        image: sail-8.1/app
        ports:
            - '${APP_PORT:-80}:80'
        environment:
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -19,9 +19,9 @@
        "@vue/compiler-sfc": "^3.0.5",
        "eslint": "^7.28.0",
        "eslint-plugin-vue": "^7.11.1",
-        "laravel-mix": "^6.0.6",
+        "laravel-mix": "^6.0.49",
        "postcss": "^8.1.14",
-        "postcss-import": "^12.0.1",
+        "postcss-import": "^14.0.2",
        "tailwindcss": "^2.0.1",
        "vue-loader": "^16.1.2"
    },
@ -32,7 +32,7 @@
        "vue": "^3.0.5",
        "vue-currency-input": "^2.0.0",
        "vue-multiselect": "^3.0.0-alpha.2",
-        "vue-unicons": "^3.2.1",
+        "vue-unicons": "^3.3.1",
        "vuex": "^4.0.0"
    }
 }
--- a/public/css/app.css
+++ b/public/css/app.css
--- a/public/js/app.js
+++ b/public/js/app.js
--- a/resources/js/Pages/Cars/Show.vue
+++ b/resources/js/Pages/Cars/Show.vue
@ -8,6 +8,9 @@
        </template>
        <template #info>
            <small-title title="Auto" class="mb-3" />
+            <div v-if="car.deleted_at" class="col-span-12 bg-red-500 p-2 -mb-1 text-white rounded-t-md font-bold">
+                Auto gelöscht am {{ car.deleted_at }}
+            </div>
            <car-card :car="car" />
        </template>
        <template #actions>
--- a/resources/js/Pages/Contacts/Components/ContactFormFields.vue
+++ b/resources/js/Pages/Contacts/Components/ContactFormFields.vue
@ -91,14 +91,14 @@ export default {
  methods: {
    fetchCity(newVal, oldVal) {
      if (newVal !== oldVal && newVal.length === 4 && this.form.country === 'CH') {
-        axios.get(`https://swisspost.opendatasoft.com/api/records/1.0/search/?dataset=plz_verzeichnis_v2&q=&facet=ortbez18&refine.postleitzahl=${newVal}`)
+        axios.get(`https://openplzapi.org/ch/Localities?postalCode=${newVal}`)
          .then((response) => {
-            let records = response.data.records;
-            if (records.length > 1) {
+            let data = response.data;
+            /*if (records.length > 1) {
              records = records.filter(rec => rec.geometry);
-            }
-            if (records[0]) {
-              this.form.city = records[0].fields.ortbez18;
+            }*/
+            if (data[0]) {
+              this.form.city = data[0].name;
            }
          });
      }
--- a/resources/js/Pages/Contacts/Show.vue
+++ b/resources/js/Pages/Contacts/Show.vue
@ -9,6 +9,9 @@

        <template #info>
            <small-title title="Kontakt" class="mb-3" />
+            <div v-if="contact.deleted_at" class="col-span-12 bg-red-500 p-2 -mb-1 text-white rounded-t-md font-bold">
+                Kontakt gelöscht am {{ contact.deleted_at }}
+            </div>
            <contact-card :contact="contact" />
        </template>

--- a/resources/js/Pages/Contracts/Edit.vue
+++ b/resources/js/Pages/Contracts/Edit.vue
@ -51,6 +51,7 @@ export default {
        price: this.contract.price,
        notes: this.contract.notes,
        insurance_type: this.contract.insurance_type,
+        type: this.contract.type,
      },
    };
  },
--- a/resources/js/Pages/Contracts/Show.vue
+++ b/resources/js/Pages/Contracts/Show.vue
@ -5,7 +5,11 @@
        </template>
        <template #info>
                    <small-title title="Vertragsinformationen" class="mb-3" />
+                    <div v-if="contract.deleted_at" class="col-span-12 bg-red-500 p-2 -mb-1 text-white rounded-t-md font-bold">
+                        Vertrag gelöscht am {{ contract.deleted_at }}
+                    </div>
                    <div class="grid grid-cols-12 gap-2 p-5 bg-white shadow rounded-md font-medium">
+                      
                        <div class="col-span-4">
                            Datum
                        </div>
--- a/resources/views/contract.blade.php
+++ b/resources/views/contract.blade.php
@ -187,10 +187,12 @@ MwSt-Nr: CHE-226.272.050
            <td>Restbetrag</td>
            <td>{{ $contract->left_to_pay }}</td>
        </tr>
+        @if ($contract->isSellContract())
            <tr>
                <td>Bankverbindung IBAN</td>
                <td>CH69 0900 0000 1549 3981 7</td>
            </tr>
+        @endif
        <tr>
            <td>Lieferdatum</td>
            <td>{{ $contract->delivery_date_formatted }}</td>
Author	SHA1	Message	Date
Nadim Salloum	2d15417dfe	updated js & css	2023-12-20 23:13:49 +01:00
Nadim Salloum	26d4bf9647	remove console.logs	2023-12-20 23:08:03 +01:00
Nadim Salloum	ad10d61c04	use new zip code API (old one is deprecated)	2023-12-20 22:51:14 +01:00
Nadim Salloum	3f0ab15f56	add default data for databaseseeder	2023-12-20 22:49:10 +01:00
Nadim Salloum	4bded4db0b	update example env to add user and DB FORWARD	2023-12-20 22:48:22 +01:00
Nadim Salloum	5c80b6e474	Update php.yml	2023-10-19 15:35:03 +02:00
Nadim Salloum	1c2df6f7f1	Create php.yml	2023-10-19 15:30:05 +02:00
Nadim Salloum	3df5f0bf21	remove iban on buy contracts	2023-04-03 10:50:25 +02:00
Nadim Salloum	3fb9ffbbe7	correct price in car all and sold export	2022-12-30 13:06:29 +01:00
Nadim Salloum	b908edd99e	correct price in car export	2022-12-30 13:04:01 +01:00
Nadim Salloum	20038797f1	show deleted banner	2022-07-06 20:05:58 +02:00
Nadim Salloum	2807f3b407	update composer dependencies	2022-07-06 20:05:43 +02:00
Nadim Salloum	c42dbc7a86	update dependencies	2022-07-05 21:40:07 +02:00
Nadim Salloum	463d02f22f	fix insurance type edit	2022-07-05 21:39:52 +02:00
Nadim Salloum	ab7ed34f81	add new insurance type	2022-03-31 17:28:20 +02:00
Nadim Salloum	7bfec123a5	fix issue with match	2022-02-21 16:52:42 +01:00
Nadim Salloum	7e19c63c4f	update to laravel 9, update dependencies	2022-02-17 12:39:06 +01:00