Merge pull request #30 from avored/dev

merging dev to master

database/migrations/2017_03_29_000000_avored_framework_schema.php

@@ -104,9 +104,11 @@ public function up()
         });
 
         OrderStatus::insert([
-            ['name' => 'Pending', 'is_default' => 1],
+            ['name' => 'New', 'is_default' => 1],
+            ['name' => 'Pending Payment', 'is_default' => 0],
+            ['name' => 'Processing', 'is_default' => 0],
+            ['name' => 'Shipped', 'is_default' => 0],
             ['name' => 'Delivered', 'is_default' => 0],
-            ['name' => 'Received', 'is_default' => 0],
             ['name' => 'Canceled', 'is_default' => 0],
         ]);
 
@@ -378,10 +380,28 @@ public function up()
             $table->string('phone')->nullable();
             $table->enum('status', ['GUEST', 'LIVE'])->default('LIVE');
             $table->string('activation_token')->nullable()->default(null);
+            $table->string('tax_no')->nullable()->default(null);
             $table->rememberToken();
             $table->timestamps();
         });
 
+        Schema::create('user_groups', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name')->nullable()->default(null);
+            $table->tinyInteger('is_default')->default(0);
+            $table->timestamps();
+        });
+
+        Schema::create('user_user_group', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('user_id')->unsigned();
+            $table->integer('user_group_id')->unsigned();
+            $table->timestamps();
+
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+            $table->foreign('user_group_id')->references('id')->on('user_groups')->onDelete('cascade');
+        });
+
         Schema::create('countries', function (Blueprint $table) {
             $table->increments('id');
             $table->string('code');
@@ -517,6 +537,7 @@ public function up()
             $table->integer('user_id')->unsigned()->nullable();
             $table->integer('shipping_address_id')->unsigned()->nullable();
             $table->integer('billing_address_id')->unsigned()->nullable();
+            $table->string('track_code')->nullable()->default(null);
 
             $table->foreign('user_id')->references('id')->on('users');
             $table->foreign('shipping_address_id')->references('id')->on('addresses');
@@ -547,6 +568,7 @@ public function up()
         });
 
         $countryModel = Country::whereCode('nz')->first();
+        $countryModel->update(['is_active' => 1]);
         $siteCurrency = SiteCurrency::create([
             'name'              => 'NZ Dollars',
             'code'              => 'NZD',

resources/assets/sass/partials/_theme.scss

@@ -12,4 +12,10 @@ body {
 
 .bg-site-second-color {
   background-color: $bg-site-second-color;
+}
+
+.note-popover.note-table-popover.in.bottom,
+.note-popover.note-image-popover.in.bottom,
+.note-popover.note-link-popover.in.bottom {
+  display:none;
 }

resources/lang/en/attribute.php

@@ -1,13 +1,11 @@
 <?php
 
 return [
-
     'list' => 'Attribute List',
     'create' => 'Create Attribute',
     'edit' => 'Edit Attribute',
 
     'name' => 'Name',
     'identifier' => 'Identifier',
     'display-text' => 'Display Text',
-
 ];

resources/lang/en/breadcrumb.php

@@ -1,27 +1,25 @@
 <?php
 
 return [
-
     'Dashboard' => 'Dashboard',
-
     'Product' => 'Product',
     'Category' => 'Category',
+
     'Attribute' => 'Attribute',
     'Property' => 'Property',
-
     'Subscriber' => 'Subscriber',
 
     'Order' => 'Order',
     'Tax Rule' => 'Tax Rule',
-
     'Configuration' => 'Configuration',
-    'Admin User' => 'Admin User',
+
+    'Admin User' => 'Users Overview',
     'Theme' => 'Theme',
     'Role' => 'Role',
 
     'Create' => 'Create',
     'Upload' => 'Upload',
     'Edit' => 'Edit',
-    'Show' => 'Show',
 
+    'Show' => 'Show',
 ];

resources/lang/en/currency.php

@@ -1,9 +1,7 @@
 <?php
 
 return [
-
-    'title' => 'Currency',
+	'title' => 'Currency',
     'create' => 'Create Currency',
     'update' => 'Update Currency',
-
 ];

resources/lang/en/lang.php

@@ -31,6 +31,7 @@
 
     'admin-dashboard-total-user-title' => 'Total User',
     'admin-dashboard-total-order-title' => 'Total Orders',
+    'admin-dashboard-recent-order-title' => 'Recent Order',
 
     'category.index.title' => 'Category List',
     'category.index.create' => 'Create Category',

resources/lang/en/orders.php

@@ -0,0 +1,26 @@
+<?php
+
+return [
+    'orders-index'  => 'Orders',
+    'order-details' => 'Order details',
+    'other-data'    => 'Order details',
+
+    'change-status' => 'Change status',
+    'add-track-code-helper' => 'The customer will use this track code to track their order on shipping company website.',
+    'change-status-helper' => 'The customer will receive a e-mail when you change the status.',    
+    'send-invoice'  => 'Send invoice',
+
+    'add-track-code' => 'Add Tracking Code',
+
+    'customer-data' => 'Customer details',
+    'billing-address' => 'Billing Address',
+    'shipping-address' => 'Shipping Address',
+
+    'history' => 'Order History',
+    'history-action' => 'Action',
+    'history-updated-at' => 'Updated at',
+
+    'products-title' => 'Products',
+    'send-invoice' => 'Email invoice',
+    'save' => 'Save changes',
+];

resources/lang/en/property.php

@@ -1,19 +1,15 @@
 <?php
 
 return [
-
     'list'      => 'Property List',
     'create'    => 'Create Property',
     'edit'      => 'Edit Property',
 
-
-
-
     'name'                  => 'Name',
     'identifier'            => 'Identifier',
     'data-type'             => 'Data Type',
+
     'field-type'            => 'Field Type',
     'sort-order'            => 'Sort Order',
     'use_for_all_products'  => 'Used this for All Products'
-
 ];

resources/lang/en/role.php

@@ -2,7 +2,7 @@
 
 return [
 
-    'role-list' => 'Role List',
+    'role-list' => 'Roles',
     'role-create' => 'Create Role',
     'role-edit' => 'Edit Role',
 

resources/lang/en/shop.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+
+    'order-status-list' => 'Order Status',
+    'order-status-create' => 'Create Order Status',
+    'order-status-update' => 'Update Order Status',
+];

resources/lang/en/system.php

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'country-list' => 'Country List',
+    'country-create' => 'Create Country',
+    'country-update' => 'Update Country',
+
+    'state-list' => 'State List',
+    'state-create' => 'Create State',
+    'state-update' => 'Update State',
+
+
+];

resources/lang/en/tax-rule.php

@@ -1,16 +1,15 @@
 <?php
 
 return [
-
     'list' => 'Tax Rule List',
     'create' => 'Create Tax Rule',
     'edit' => 'Edit Tax Rule',
 
     'name' => 'Name',
     'country' => 'Country',
     'state-code' => 'State Code',
+
     'post-code' => 'Post Code',
     'percentage' => 'Percentage',
     'priority' => 'Priority',
-
 ];

resources/lang/en/theme.php

@@ -1,12 +1,10 @@
 <?php
 
 return [
-
-    'theme-list' => 'Theme List',
+    'theme-list' => 'Themes overview',
     'theme-upload' => 'Upload Theme',
-    'theme-upload-file' => 'Upload Theme File',
+    'theme-upload-file' => 'Select theme file',
 
     'activate' => 'Activate',
     'deactivate' => 'Deactivate',
-
 ];

resources/lang/en/user.php

@@ -1,17 +1,36 @@
 <?php
 
 return [
-
-    'admin-user-list' => 'Admin User List',
+    'admin-user-list' => 'Users',
     'admin-user-create' => 'Create Admin User',
     'admin-user-update' => 'Update Admin User',
 
+    'user-group-id' => 'User Groups',
+    'user-group-list' => 'User Groups',
+    'user-group-create' => 'Create User Group',
+    'user-group-update' => 'Update User Group',
+    'user-group-edit' => 'Edit User Group',
+
+    'change-password' => 'Change Password',
+    'new-password' => 'New Password',
+    'confirm-password' => 'Confirm Password',
+
+    'user-list' => 'Users',
+    'user-create' => 'Create User',
+    'user-update' => 'Update User',
+    'user-edit' => 'Edit User',
+    'user-details' => 'User Details',
+
+    'user-group-name' => ' Name',
+    'is_default' => ' Is Default',
+
     'first-name' => 'First Name',
     'last-name' => 'Last Name',
     'email' => 'Email',
+
     'password' => 'Password',
     'confirm-password' => 'Confirm Password',
     'user-role' => 'Role',
+
     'file' => 'Profile Image',
-
 ];

resources/views/datagrid/grid.blade.php

@@ -69,26 +69,32 @@ class="form-control" />
     </div>
 
     <div class="avored-table-body">
-       
+
         @foreach($dataGrid->data as $row)
         <div class="avored-table-row ">
             @foreach($dataGrid->columns as $column)
                 <div class="{{ $column->class() }} avored-table-cell">
                     @if($column->type() == "link")
                         {!! $column->executeCallback($row) !!}
                     @else
-                        <?php $identifier = $column->identifier() ?>
-                        {{ $row->$identifier }}
+                        <?php  
+                        $identifier = $column->identifier();
+                        ?>
+                        @if(is_array($row))
+                            {{ array_get($row, $identifier) }}
+                        @else
+                            {{ $row->$identifier }}
+                        @endif
+
                     @endif
                 </div>
             @endforeach
         </div>
     @endforeach
 
     </div>
-
 
-    {!! $dataGrid->data->appends(Request::except($dataGrid->data->getPageName()))->render('pagination::bootstrap-4') !!}
+    {!! $dataGrid->data->appends(Request::except($dataGrid->data->getPageName()))->links('pagination::bootstrap-4') !!}
 
 </div>
 

resources/views/forms/password.blade.php

@@ -1,6 +1,6 @@
 <?php
 
-$attributes['type'] = 'text';
+$attributes['type'] = 'password';
 $attributes['class'] = 'form-control';
 $attributes['id'] = $name;
 $attributes['name'] = $name;

resources/views/forms/select2.blade.php

@@ -6,13 +6,11 @@
 
 if(isset($attributes)) {
     $attributes['name'] = $name;
-    $attributes['type'] = "text";
     if(!isset($attributes['id'])) {
         $attributes['id'] = $name;
     }
 
 } else {
-    $attributes['type'] = "text";
     $attributes['class'] = 'form-control select2';
     $attributes['id'] = $name;
     $attributes['name'] = $name;

resources/views/home.blade.php

@@ -4,6 +4,7 @@
 <div class="row">
     <div class="col-md-12">
         <div class="row">
+
             <div class="col-4 widget-column" ondrop="drop(event)" ondragover="allowDrop(event)">
                 <div class="widget-wrapper">
                     <div class="widget mt-3 mb-3" id="widget-{{ Widget::get('total-user')->identifier() }}"
@@ -13,17 +14,23 @@
                 </div>
             </div>
 
-                <div class="col-4 widget-column" ondrop="drop(event)" ondragover="allowDrop(event)">
-                    <div class="widget-wrapper">
-                        <div class="widget mt-3 mb-3" id="widget-{{ Widget::get('total-order')->identifier() }}"
-                             draggable="true" ondragstart="drag(event)">
-                            @include (Widget::get('total-order')->view(),Widget::get('total-order')->with())
-                        </div>
+            <div class="col-4 widget-column" ondrop="drop(event)" ondragover="allowDrop(event)">
+                <div class="widget-wrapper">
+                    <div class="widget mt-3 mb-3" id="widget-{{ Widget::get('total-order')->identifier() }}"
+                            draggable="true" ondragstart="drag(event)">
+                        @include (Widget::get('total-order')->view(),Widget::get('total-order')->with())
                     </div>
                 </div>
+            </div>
 
-                <div class="col-4 widget-column" ondrop="drop(event)" ondragover="allowDrop(event)">
-
+            <div class="col-4 widget-column" ondrop="drop(event)" ondragover="allowDrop(event)">
+                <div class="widget-wrapper">
+                        <div class="widget mt-3 mb-3" 
+                                id="widget-{{ Widget::get('recent-order')->identifier() }}"
+                                draggable="true" ondragstart="drag(event)">
+                            @include (Widget::get('recent-order')->view(),Widget::get('recent-order')->with())
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>

resources/views/layouts/app.blade.php

@@ -49,7 +49,7 @@
         @if (Route::getCurrentRoute()->getName() === 'admin.dashboard')
 
         @else
-            {!! Breadcrumb::render(Route::getCurrentRoute()->getName()  ) !!}
+            {!! Breadcrumb::render(Route::getCurrentRoute()->getName()) !!}
         @endif
 
         @yield('content')