Merge pull request #60 from avored/dev

merging dev to master

database/factories/UserFactory.php

@@ -9,7 +9,6 @@
         'email' => $faker->email,
         'password' => bcrypt($faker->phoneNumber),
         'phone' => $faker->phoneNumber,
-        'status' => 'LIVE'
-
+        'status' => 'LIVE'      
     ];
 });

database/migrations/2017_03_29_000000_avored_framework_schema.php

@@ -607,9 +607,30 @@ public function up()
             $table->string('params')->nullable()->default(null);
             $table->timestamps();
 
-            $table->foreign('menu_group_id')->references('id')->on('menu_groups')->onDelete('cascade');;
+            $table->foreign('menu_group_id')->references('id')->on('menu_groups')->onDelete('cascade');
         });
 
+        Schema::create('tax_groups', function(Blueprint $table) {
+            $table->increments('id');
+            $table->string('name')->nullable()->default(null);
+            $table->string('description')->nullable()->default(null);
+            $table->timestamps();
+        });
+
+        Schema::create('tax_rates', function(Blueprint $table) {
+            $table->increments('id');
+            $table->string('name')->nullable()->default(null);
+            $table->string('description')->nullable()->default(null);
+            $table->float('rate', 10, 6);
+            $table->integer('country_id')->unsigned();
+            $table->integer('state_id')->unsigned()->nullable()->default(null);
+            $table->integer('postcode')->nullable()->default(null);
+            $table->enum('rate_type', ['PERCENTAGE', 'FIXED'])->default('PERCENTAGE');
+            $table->enum('applied_with', ['SHIPPING', 'BILLING', 'STORE'])->default('SHIPPING');
+            $table->timestamps();
+        });
+
+
         $countryModel = Country::whereCode('nz')->first();
         $countryModel->update(['is_active' => 1]);
         $siteCurrency = SiteCurrency::create([

resources/lang/en/system.php

@@ -9,6 +9,17 @@
     'state-create' => 'Create State',
     'state-update' => 'Update State',
 
+    'tax-group' => [
+        'title' => 'Tax Group',
+        'create' => 'Create Tax Group',
+        'update' => 'Update Tax Group',
+    ],
+    'tax-rate' => [
+        'title' => 'Tax Rate',
+        'create' => 'Create Tax Rate',
+        'update' => 'Update Tax Rate',
+    ],
+
     'site-currency' => [
         'title' => 'Currency',
         'create' => 'Create Currency',

resources/sass/app.scss

@@ -19,7 +19,9 @@ img {
     border: none;
     background: none;
 }
-
+.extra-product-link {
+   left: -120px !important;
+}
 #dataTable tr th:last-of-type {
     min-width: 95px;
 }

resources/sass/spec/components/index.scss

@@ -20,12 +20,10 @@
         &.header {
             background-color: $primary;
             color: $white;
-
         } 
 
         .avored-table-cell {
             padding: 0.5em;
-
             a, i {
                 color: $white;
             }
@@ -39,17 +37,14 @@
         .avored-table-row {
             &:hover { 
                 background-color: darken($light, 20%); 
-
             }
 
             .avored-table-cell {
                 padding: 0.5em;
-
                 a {
                     color:inherit;
                 }
             }
         }
-
     }
-}
+}

resources/sass/spec/components/sidebar.scss

@@ -37,6 +37,7 @@
         a {
           .logo {
             background-position: center center;
+            padding: 15px 10px;
             width: $collapsed-size;
           }
         }
@@ -141,6 +142,7 @@
       display: inline-block;
       min-height: calc(#{$header-height} - 1px);
       width: 100%;
+      padding: 15px 10px;
       width: 70px;
     }
 
@@ -445,4 +447,4 @@
       left: 0;
     }
   }
-}
+}

resources/views/datagrid/grid.blade.php

@@ -84,5 +84,8 @@ class="form-control" />
 </table>
 
 <div class="row justify-content-end">
-    {!! $dataGrid->data->appends(Request::except($dataGrid->data->getPageName()))->links('pagination::bootstrap-4') !!}
+    <div class="col-12">
+        {!! $dataGrid->data->appends(Request::except($dataGrid->data->getPageName()))->links('pagination::bootstrap-4') !!}
+    </div>
+
 </div>

resources/views/forms/select.blade.php

@@ -32,4 +32,4 @@
         @endforeach
     </select>
 
-</div>
+</div>

resources/views/layouts/app.blade.php

@@ -31,6 +31,7 @@
       @include("avored-framework::layouts.nav")
       <main class='main-content bgc-grey-100'>
         <div id='mainContent'>
+          @include("avored-framework::layouts.notifications")
           <div class="masonry-sizer col-md-6"></div>
           <h4 class="c-grey-900 mT-10 mB-30">@yield('page-header')</h4>
             @yield('content')

resources/views/layouts/notifications.blade.php

@@ -0,0 +1,24 @@
+<div class="row">
+    <div class="col-12">
+        @if(session()->has('errorNotificationText'))
+            <div class="alert alert-danger alert-dismissible" role="alert">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+
+                <strong>Error!</strong> {{ session()->get('errorNotificationText') }}
+            </div>
+        @endif
+
+
+        @if(session()->has('notificationText'))
+            <div class="alert alert-success alert-dismissible" role="alert">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+
+                <strong>Success!</strong> {{ session()->get('notificationText') }}
+            </div>
+        @endif
+    </div>
+</div>

resources/views/product/order-status/create.blade.php → resources/views/order/order-status/create.blade.php

@@ -13,7 +13,7 @@
                     <form action="{{ route('admin.order-status.store') }}" method="post">
                         @csrf
 
-                        @include('avored-framework::product .order-status._fields')
+                        @include('avored-framework::order.order-status._fields')
 
                         <div class="form-group">
                             <button class="btn btn-primary" type="submit">

resources/views/product/order-status/edit.blade.php → resources/views/order/order-status/edit.blade.php

@@ -15,7 +15,7 @@
                         @csrf()
                         @method('put')
 
-                        @include('avored-framework::product.order-status._fields')
+                        @include('avored-framework::order.order-status._fields')
 
                         <div class="form-group">
                             <button class="btn btn-primary" type="submit">

resources/views/product/index.blade.php

@@ -2,16 +2,24 @@
 
 @section('content')
     <h1>
-    	<span class="main-title-wrap">{{ __('avored-framework::lang.product.index.title') }}</span>
-    	<a style="" href="{{ route('admin.product.create') }}" class="btn btn-primary float-right">
-    		{{ __('avored-framework::lang.product.create.text') }}
-         </a>
-    </h1>
-
+		<span class="main-title-wrap">{{ __('avored-framework::lang.product.index.title') }}</span>
+		<div class="btn-group float-right" role="group">
+			<a style="" href="{{ route('admin.product.create') }}" class="btn btn-primary">
+				{{ __('avored-framework::lang.product.create.text') }}
+			</a>
 
-    <div class="card">
-    	<div class="card-body">
-      		{!! DataGrid::render($dataGrid) !!}
-      	</div>
-      </div>
+			<div class="btn-group" role="group">
+				<button id="btnGroupDrop1" type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+
+				</button>
+				<div class="dropdown-menu extra-product-link" aria-labelledby="btnGroupDrop1">
+				<a class="dropdown-item" href="#">Import Product</a>
+				<a class="dropdown-item" href="{{ route('admin.product.export') }}">Export Product</a>
+				</div>
+			</div>
+		</div>
+
+    </h1>
+	{!! DataGrid::render($dataGrid) !!}
+
 @stop

resources/views/system/site-currency/show.blade.php

@@ -14,7 +14,7 @@
 
                 <tr>
                     <td>Curreny Code</td>
-                    <td>{{ $siteCurrency->curreny_code }}</td>
+                    <td>{{ $siteCurrency->code }}</td>
                 </tr>
 
                 <tr>

resources/views/system/tax-group/_fields.blade.php

@@ -0,0 +1,2 @@
+@include('avored-framework::forms.text', ['name' => 'name', 'label' => 'Name'])
+@include('avored-framework::forms.textarea', ['name' => 'description', 'label' => 'Description'])

resources/views/system/tax-group/create.blade.php

@@ -0,0 +1,33 @@
+@extends('avored-framework::layouts.app')
+
+@section('content')
+
+    <div id="admin-tax-group-page" class="row">
+        <div class="col-12">
+            <div class="card">
+                <div class="card-header">
+                    {{ __('avored-framework::system.tax-group.create') }}
+                </div>
+                <div class="card-body">
+
+                    <form action="{{ route('admin.tax-group.store') }}" method="post">
+                        @csrf
+
+                        @include('avored-framework::system.tax-group._fields')
+
+                        <div class="form-group">
+                            <button class="btn btn-primary" type="submit">
+                                {{ __('avored-framework::system.tax-group.create') }}
+                            </button>
+                            <a href="{{ route('admin.tax-group.index') }}" class="btn">
+                                {{ __('avored-framework::lang.cancel') }}
+                            </a>
+                        </div>
+
+                    </form>
+                </div>
+            </div>
+
+        </div>
+    </div>
+@endsection

resources/views/system/tax-group/edit.blade.php

@@ -0,0 +1,57 @@
+@extends('avored-framework::layouts.app')
+
+@section('content')
+
+    <div id=admin-admin-state-page class="row">
+        <div class="col-12">
+            <div class="card">
+                <div class="card-header">
+                    {{ __('avored-framework::system.tax-group.update') }}
+                </div>
+                <div class="card-body">
+                    <form action="{{ route('admin.tax-group.update', $model->id) }}" 
+
+                        method="post">
+                        @csrf()
+                        @method('put')
+
+                        @include('avored-framework::system.tax-group._fields')
+
+                        <div class="form-group">
+                            <button class="btn btn-primary" type="submit">
+                                {{ __('avored-framework::system.tax-group.update') }}
+                            </button>
+                            <a href="{{ route('admin.tax-group.index') }}" class="btn">
+                                {{ __('avored-framework::lang.cancel') }}
+                            </a>
+                        </div>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@push('scripts')
+
+<script>
+
+ var app = new Vue({
+        el: '#admin-admin-state-page',
+        data : {
+            model: {},
+            autofocus:true,
+            disabled: true
+        },
+        methods: {
+            changeModelValue: function(val,fieldName) {
+                this.model[fieldName] = val;
+            }
+        }
+    });
+
+</script>
+
+
+@endpush

resources/views/system/tax-group/index.blade.php

@@ -0,0 +1,17 @@
+@extends('avored-framework::layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="h1">
+        {{ __('avored-framework::system.tax-group.title') }}
+
+        <a href="{{ route('admin.tax-group.create') }}" 
+                class="float-right btn btn-primary">
+            {{ __('avored-framework::system.tax-group.create') }}
+        </a>
+    </div>
+
+    {!! DataGrid::render($dataGrid) !!}
+
+</div>
+@stop