Merge pull request #11 from picbenoit/add_name_column_to_shopper_addresses_table

Add name column to shopper addresses table

Author: mckenziearts

public/css/login.css

@@ -1,6 +1,6 @@
 {
-    "/js/login.js": "/js/login.js?id=0ead881a9e848c53d468",
-    "/css/login.css": "/css/login.css?id=bcece9b51815964b959b",
-    "/css/shopper.css": "/css/shopper.css?id=09fa142477d7a67721b5",
-    "/js/shopper.js": "/js/shopper.js?id=61bf2cbd50dbd9af26a3"
+    "/js/login.js": "/js/login.js?id=fa0c4833a51bf5b87273",
+    "/css/login.css": "/css/login.css?id=920238a4dce032e3f6b7",
+    "/css/shopper.css": "/css/shopper.css?id=5e0d036d0c5e3aac5dfd",
+    "/js/shopper.js": "/js/shopper.js?id=4d0c155f0e52f82d1ffc"
 }

public/css/shopper.css

@@ -789,6 +789,9 @@ export default class UserForm extends ShopperComponent {
               </Switch>
               <span className='active-label'>{this.trans.get('Default')}</span>
               <p className='m-b-sm'/>
+              <Form.Item label={this.trans.get('Name')} prop='name'>
+                <Input type='text' value={this.state.addressForm.name} onChange={this.onAddressFormChange.bind(this, 'name')} autoComplete='off' />
+              </Form.Item>
               <Layout.Row gutter="20">
                 <Layout.Col span="12">
                   <Form.Item label={this.trans.get('Country')} prop='country_id'>

public/js/login.js

@@ -1,5 +1,6 @@
 const addressFields = {
   active: 0,
+  name: '',
   country_id: '',
   state_id: '',
   city: '',

public/js/shopper.js

@@ -4,6 +4,11 @@ const addressesColumns = [
   {
     type: 'selection'
   },
+  {
+      label: translate.get('Name'),
+      prop: "name",
+      sortable: true
+  },
   {
     label: translate.get('Country'),
     prop: "country_id",

public/mix-manifest.json

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddNameColumnToShopperAddresses extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (!Schema::hasColumn('shopper_addresses', 'name')) {
+            Schema::table('shopper_addresses', function (Blueprint $table) {
+                $table->string('name')->after('active')->nullable();
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        if (Schema::hasColumn('shopper_addresses', 'name')) {
+            Schema::table('shopper_addresses', function (Blueprint $table) {
+                $table->dropColumn('name');
+            });
+        }
+    }
+}

resources/js/components/users/UserForm.jsx

@@ -20,7 +20,7 @@ class Address extends Model
      * {@inheritDoc}
      */
     protected $fillable = [
-        'active', 'user_id', 'country_id', 'state_id', 'city', 'street', 'phone_number', 'address', 'post_code'
+        'active', 'user_id', 'name', 'country_id', 'state_id', 'city', 'street', 'phone_number', 'address', 'post_code'
     ];
 
     /**