From 3ca5c99f271d45852b3aa2468ad91b7b6217c8b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gro=C3=9Fe?= <david.grosse@haendlerbund.de>
Date: Fri, 10 Jan 2020 11:05:09 +0100
Subject: [PATCH] introduce company_name column to customer_addresses

---
 ...add_company_name_to_customer_addresses.php | 32 +++++++++++++++++++
 .../Customer/src/Models/CustomerAddress.php   | 15 ++++++++-
 .../Webkul/Shop/src/Resources/lang/en/app.php |  2 ++
 .../account/address/create.blade.php          |  6 ++++
 .../customers/account/address/edit.blade.php  |  7 +++-
 5 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 packages/Webkul/Customer/src/Database/Migrations/2020_01_10_151902_add_company_name_to_customer_addresses.php

diff --git a/packages/Webkul/Customer/src/Database/Migrations/2020_01_10_151902_add_company_name_to_customer_addresses.php b/packages/Webkul/Customer/src/Database/Migrations/2020_01_10_151902_add_company_name_to_customer_addresses.php
new file mode 100644
index 000000000..f7f732e90
--- /dev/null
+++ b/packages/Webkul/Customer/src/Database/Migrations/2020_01_10_151902_add_company_name_to_customer_addresses.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddCompanyNameToCustomerAddresses extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('customer_addresses', function (Blueprint $table) {
+            $table->string('company_name')->nullable()->before('address1');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('customer_addresses', function (Blueprint $table) {
+            $table->dropColumn('company_name');
+        });
+    }
+}
diff --git a/packages/Webkul/Customer/src/Models/CustomerAddress.php b/packages/Webkul/Customer/src/Models/CustomerAddress.php
index f40fe6caa..4301da398 100755
--- a/packages/Webkul/Customer/src/Models/CustomerAddress.php
+++ b/packages/Webkul/Customer/src/Models/CustomerAddress.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Webkul\Customer\Models;
 
 use Illuminate\Database\Eloquent\Model;
@@ -8,5 +9,17 @@ class CustomerAddress extends Model implements CustomerAddressContract
 {
     protected $table = 'customer_addresses';
 
-    protected $fillable = ['customer_id' ,'address1', 'country', 'state', 'city', 'postcode', 'phone', 'default_address'];
+    protected $fillable = [
+        'customer_id',
+        'company_name',
+        'address1',
+        'address2',
+        'address3',
+        'country',
+        'state',
+        'city',
+        'postcode',
+        'phone',
+        'default_address',
+    ];
 }
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 2381ee38c..97669643d 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -219,6 +219,7 @@ return [
 
                 'create' => [
                     'page-title' => 'Add Address Form',
+                    'company_name' => 'Company name',
                     'title' => 'Add Address',
                     'street-address' => 'Street Address',
                     'country' => 'Country',
@@ -234,6 +235,7 @@ return [
 
                 'edit' => [
                     'page-title' => 'Edit Address',
+                    'company_name' => 'Company name',
                     'title' => 'Edit Address',
                     'street-address' => 'Street Address',
                     'submit' => 'Save Address',
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
index 99b8948ae..fe8df4ee0 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
@@ -26,6 +26,12 @@
 
                     {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.before') !!}
 
+                    <div class="control-group" :class="[errors.has('company_name') ? 'has-error' : '']">
+                        <label for="company_name" class="required">{{ __('shop::app.customer.account.address.create.company_name') }}</label>
+                        <input type="text" class="control" name="company_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.company_name') }}&quot;">
+                        <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
+                    </div>
+
                     <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
                         <label for="address_0" class="required">{{ __('shop::app.customer.account.address.create.street-address') }}</label>
                         <input type="text" class="control" name="address1[]" id="address_0" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
index be72566f2..e84182797 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
@@ -18,7 +18,7 @@
             </div>
 
             {!! view_render_event('bagisto.shop.customers.account.address.edit.before', ['address' => $address]) !!}
-            
+
             <form method="post" action="{{ route('customer.address.edit', $address->id) }}" @submit.prevent="onSubmit">
 
                 <div class="account-table-content">
@@ -27,6 +27,11 @@
 
                     {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.before', ['address' => $address]) !!}
 
+                    <div class="control-group" :class="[errors.has('company_name') ? 'has-error' : '']">
+                        <label for="company_name" class="required">{{ __('shop::app.customer.account.address.edit.company_name') }}</label>
+                        <input type="text" class="control" name="company_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.edit.company_name') }}&quot;">
+                        <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
+                    </div>
 
                     <?php $addresses = explode(PHP_EOL, $address->address1); ?>