From f4be294219cda8e92b3c9eb65f85d021f35e5816 Mon Sep 17 00:00:00 2001 From: Adrian Perez Date: Sun, 30 Jun 2019 22:54:43 +0200 Subject: [PATCH 1/8] Update README.md Fix and remove numbering in anchors --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 30a18d51b..b9c777164 100755 --- a/README.md +++ b/README.md @@ -11,14 +11,14 @@

# Topics -1. ### [Introduction](#1-introduction-) -2. ### [Documentation](#2-documentation-) -3. ### [Requirements](#2-requirements-) -4. ### [Installation & Configuration](#3-installation--configuration-) -5. ### [License](#4-license-) -6. ### [Miscellaneous](#5-miscellaneous-) +1. [Introduction](#introduction) +2. [Documentation](#documentation) +3. [Requirements](#requirements) +4. [Installation & Configuration](#installation-and-configuration) +5. [License](#license) +6. [Miscellaneous](#miscellaneous) -### 1. Introduction : +### Introduction [Bagisto](https://www.bagisto.com) is a hand tailored E-Commerce framework designed on some of the hottest opensource technologies such as [Laravel](https://laravel.com) a [PHP](https://secure.php.net/) framework, [Vue.js](https://vuejs.org) @@ -54,11 +54,11 @@ It packs in lots of demanding features that allows your business to scale in no Dev guys can take advantage of two of the hottest frameworks used in this project Laravel and Vue.js, both of these frameworks have been used in Bagisto. Bagisto is using power of both of these frameworks and making best out of it out of the box. -### 2. Documentation : +### Documentation #### Bagisto Documentation [https://devdocs.bagisto.com](https://devdocs.bagisto.com) -### 3. Requirements : +### Requirements * **OS**: Ubuntu 16.04 LTS or higher. * **SERVER**: Apache 2 or NGINX @@ -70,7 +70,7 @@ Bagisto is using power of both of these frameworks and making best out of it out * **Node**: 8.11.3 LTS or higher. * **Composer**: 1.6.5 or higher. -### 4. Installation & Configuration : +### Installation & Configuration **1. Try our new GUI installer to install Bagisto:** @@ -172,11 +172,11 @@ password:admin123 > *http(s)://example.com/customer/register* -### 5. License : +### License Bagisto is a truly opensource E-Commerce framework which will always be free under the [MIT License](https://github.com/bagisto/bagisto/blob/master/LICENSE). -### 6. Miscellaneous : +### Miscellaneous #### Contributors From be24f5a86d921d80b7210280425241ff51b1c4c6 Mon Sep 17 00:00:00 2001 From: Adrian Perez Date: Sun, 30 Jun 2019 23:10:35 +0200 Subject: [PATCH 2/8] Update README.md Improve backers and sponsors content and fix anchor --- README.md | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index b9c777164..ff65fba01 100755 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Sponsors on Open Collective

-# Topics +## Topics 1. [Introduction](#introduction) 2. [Documentation](#documentation) 3. [Requirements](#requirements) @@ -70,7 +70,7 @@ Bagisto is using power of both of these frameworks and making best out of it out * **Node**: 8.11.3 LTS or higher. * **Composer**: 1.6.5 or higher. -### Installation & Configuration +### Installation and Configuration **1. Try our new GUI installer to install Bagisto:** @@ -178,30 +178,18 @@ Bagisto is a truly opensource E-Commerce framework which will always be free und ### Miscellaneous -#### Contributors +#### Contributors and Backers -This project exists thanks to all the people who contribute. - +This project is on [Open Collective](https://opencollective.com/bagisto) and it exists thanks to this people who contribute. + -#### Backers +Thank you to all our backers! 🙏 -Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/bagisto#backer)] + - +##### Sponsors +Support this project by becoming a sponsor. Your logo will show up here with a link to your website. -#### Sponsors - -Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/bagisto#sponsor)] - - - - - - - - - - - + From 05518861074c90e31fbb744ae9162356754d14a6 Mon Sep 17 00:00:00 2001 From: Adrian Perez Date: Sun, 30 Jun 2019 23:11:11 +0200 Subject: [PATCH 3/8] Update README.md Fix heading for sponsors --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff65fba01..0797da47e 100755 --- a/README.md +++ b/README.md @@ -188,7 +188,7 @@ Thank you to all our backers! 🙏 -##### Sponsors +#### Sponsors Support this project by becoming a sponsor. Your logo will show up here with a link to your website. From a0ba845e3713f239bbd045a045fd599b79d8c1bb Mon Sep 17 00:00:00 2001 From: Moshe Lustigman Date: Tue, 23 Jul 2019 18:05:57 -0400 Subject: [PATCH 4/8] Add text direction configuration for locales --- .../Admin/src/DataGrids/LocalesDataGrid.php | 11 ++++++- .../Admin/src/Resources/lang/en/app.php | 2 ++ .../views/layouts/anonymous-master.blade.php | 7 ++++- .../Resources/views/layouts/master.blade.php | 6 +++- .../views/settings/locales/create.blade.php | 9 ++++++ .../views/settings/locales/edit.blade.php | 9 ++++++ .../2019_07_23_033128_alter_locales_table.php | 30 +++++++++++++++++++ .../src/Http/Controllers/LocaleController.php | 6 ++-- packages/Webkul/Core/src/Models/Locale.php | 4 +-- .../Resources/views/layouts/master.blade.php | 6 +++- 10 files changed, 82 insertions(+), 8 deletions(-) create mode 100644 packages/Webkul/Core/src/Database/Migrations/2019_07_23_033128_alter_locales_table.php diff --git a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php index 63dc7a54a..14ff10f32 100755 --- a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php @@ -19,7 +19,7 @@ class LocalesDataGrid extends DataGrid public function prepareQueryBuilder() { - $queryBuilder = DB::table('locales')->addSelect('id', 'code', 'name'); + $queryBuilder = DB::table('locales')->addSelect('id', 'code', 'name', 'direction'); $this->setQueryBuilder($queryBuilder); } @@ -52,6 +52,15 @@ class LocalesDataGrid extends DataGrid 'sortable' => true, 'filterable' => true ]); + + $this->addColumn([ + 'index' => 'direction', + 'label' => trans('admin::app.datagrid.direction'), + 'type' => 'select', + 'searchable' => true, + 'sortable' => true, + 'filterable' => true + ]); } public function prepareActions() { diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index eb50ee2ed..7e050aaea 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -114,6 +114,7 @@ return [ 'code' => 'Code', 'admin-name' => 'Name', 'name' => 'Name', + 'direction' => 'Direction', 'fullname' => 'Full Name', 'type' => 'Type', 'required' => 'Required', @@ -561,6 +562,7 @@ return [ 'general' => 'General', 'code' => 'Code', 'name' => 'Name', + 'direction' => 'Direction', 'create-success' => 'Locale created successfully.', 'update-success' => 'Locale updated successfully.', 'delete-success' => 'Locale deleted successfully.', diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php index 9f3ca20ef..572fae4be 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php @@ -1,3 +1,8 @@ +@php + $locale = Webkul\Core\Models\Locale::where('code', app()->getLocale())->first(); +@endphp + +@endphp @@ -67,7 +72,7 @@ {!! view_render_event('bagisto.admin.layout.head') !!} - getLocale() == 'ar') class="rtl" @endif style="scroll-behavior: smooth;"> + direction == 'rtl') class="rtl" @endif style="scroll-behavior: smooth;">
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php index a64de8787..47211d650 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php @@ -1,3 +1,7 @@ +@php + $locale = Webkul\Core\Models\Locale::where('code', app()->getLocale())->first(); +@endphp + @@ -19,7 +23,7 @@ - getLocale() == 'ar') class="rtl" @endif style="scroll-behavior: smooth;"> + direction == 'rtl') class="rtl" @endif style="scroll-behavior: smooth;"> {!! view_render_event('bagisto.admin.layout.body.before') !!}
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php index fd82a1d0a..fa3d74db6 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php @@ -41,6 +41,15 @@ @{{ errors.first('name') }}
+ +
+ + + @{{ errors.first('direction') }} +
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php index 3f3e9ee25..939c8441c 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php @@ -44,6 +44,15 @@ @{{ errors.first('name') }} + +
+ + + @{{ errors.first('direction') }} +
diff --git a/packages/Webkul/Core/src/Database/Migrations/2019_07_23_033128_alter_locales_table.php b/packages/Webkul/Core/src/Database/Migrations/2019_07_23_033128_alter_locales_table.php new file mode 100644 index 000000000..aa29e549c --- /dev/null +++ b/packages/Webkul/Core/src/Database/Migrations/2019_07_23_033128_alter_locales_table.php @@ -0,0 +1,30 @@ +enum('direction', ['ltr', 'rtl'])->default('ltr'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('locales'); + } +} diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php index ff8f5f058..16b28287e 100755 --- a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php +++ b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php @@ -72,7 +72,8 @@ class LocaleController extends Controller { $this->validate(request(), [ 'code' => ['required', 'unique:locales,code', new \Webkul\Core\Contracts\Validations\Code], - 'name' => 'required' + 'name' => 'required', + 'direction' => 'in:ltr,rtl' ]); Event::fire('core.locale.create.before'); @@ -110,7 +111,8 @@ class LocaleController extends Controller { $this->validate(request(), [ 'code' => ['required', 'unique:locales,code,' . $id, new \Webkul\Core\Contracts\Validations\Code], - 'name' => 'required' + 'name' => 'required', + 'direction' => 'in:ltr,rtl' ]); Event::fire('core.locale.update.before', $id); diff --git a/packages/Webkul/Core/src/Models/Locale.php b/packages/Webkul/Core/src/Models/Locale.php index b12be89de..572e576a5 100755 --- a/packages/Webkul/Core/src/Models/Locale.php +++ b/packages/Webkul/Core/src/Models/Locale.php @@ -13,6 +13,6 @@ class Locale extends Model implements LocaleContract * @var array */ protected $fillable = [ - 'code', 'name' + 'code', 'name', 'direction' ]; -} \ No newline at end of file +} diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php index 368893ba7..190b3df2e 100755 --- a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php @@ -1,3 +1,7 @@ +@php + $locale = Webkul\Core\Models\Locale::where('code', app()->getLocale())->first(); +@endphp + @@ -30,7 +34,7 @@ -getLocale() == 'ar') class="rtl" @endif style="scroll-behavior: smooth;"> +direction == 'rtl') class="rtl" @endif style="scroll-behavior: smooth;"> {!! view_render_event('bagisto.shop.layout.body.before') !!} From e038416f55e82dfbc7f08470d868fed2329f14ab Mon Sep 17 00:00:00 2001 From: moe2566 Date: Tue, 23 Jul 2019 19:22:03 -0400 Subject: [PATCH 5/8] Update 2019_07_23_033128_alter_locales_table.php --- .../Migrations/2019_07_23_033128_alter_locales_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Core/src/Database/Migrations/2019_07_23_033128_alter_locales_table.php b/packages/Webkul/Core/src/Database/Migrations/2019_07_23_033128_alter_locales_table.php index aa29e549c..bcca3d042 100644 --- a/packages/Webkul/Core/src/Database/Migrations/2019_07_23_033128_alter_locales_table.php +++ b/packages/Webkul/Core/src/Database/Migrations/2019_07_23_033128_alter_locales_table.php @@ -25,6 +25,6 @@ class AlterLocalesTable extends Migration */ public function down() { - Schema::dropIfExists('locales'); + } } From ae6c6fa1934054e6c4e3dc6926096f7bd3e35d94 Mon Sep 17 00:00:00 2001 From: ArmCM Date: Wed, 24 Jul 2019 02:50:22 -0500 Subject: [PATCH 6/8] WIP - fix code style laravel --- .../src/Http/Controllers/UserController.php | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php index 2201ea9c0..b0d5855b2 100755 --- a/packages/Webkul/User/src/Http/Controllers/UserController.php +++ b/packages/Webkul/User/src/Http/Controllers/UserController.php @@ -2,13 +2,11 @@ namespace Webkul\User\Http\Controllers; -use Illuminate\Http\Request; -use Illuminate\Http\Response; -use Illuminate\Support\Facades\Event; +use Exception; +use Webkul\User\Http\Requests\UserForm; +use Illuminate\Support\Facades\{ Event, Hash }; use Webkul\User\Repositories\AdminRepository as Admin; use Webkul\User\Repositories\RoleRepository as Role; -use Webkul\User\Http\Requests\UserForm; -use Hash; /** * Admin user controller @@ -42,8 +40,8 @@ class UserController extends Controller /** * Create a new controller instance. * - * @param \Webkul\User\Repositories\AdminRepository $admin - * @param \Webkul\User\Repositories\RoleRepository $role + * @param \Webkul\User\Repositories\AdminRepository $admin + * @param \Webkul\User\Repositories\RoleRepository $role * @return void */ public function __construct(Admin $admin, Role $role) @@ -60,7 +58,7 @@ class UserController extends Controller /** * Display a listing of the resource. * - * @return \Illuminate\Http\Response + * @return \Illuminate\View\View */ public function index() { @@ -70,7 +68,7 @@ class UserController extends Controller /** * Show the form for creating a new resource. * - * @return \Illuminate\Http\Response + * @return \Illuminate\View\View */ public function create() { @@ -83,11 +81,11 @@ class UserController extends Controller * Store a newly created resource in storage. * * @param \Webkul\User\Http\Requests\UserForm $request - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\RedirectResponse */ public function store(UserForm $request) { - $data = request()->all(); + $data = $request->all(); if (isset($data['password']) && $data['password']) $data['password'] = bcrypt($data['password']); @@ -107,7 +105,7 @@ class UserController extends Controller * Show the form for editing the specified resource. * * @param int $id - * @return \Illuminate\Http\Response + * @return \Illuminate\View\View */ public function edit($id) { @@ -123,11 +121,11 @@ class UserController extends Controller * * @param \Webkul\User\Http\Requests\UserForm $request * @param int $id - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\RedirectResponse */ public function update(UserForm $request, $id) { - $data = request()->all(); + $data = $request->all(); if (! $data['password']) unset($data['password']); @@ -155,7 +153,7 @@ class UserController extends Controller * Remove the specified resource from storage. * * @param int $id - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\RedirectResponse */ public function destroy($id) { @@ -178,7 +176,7 @@ class UserController extends Controller Event::fire('user.admin.delete.after', $id); return response()->json(['message' => true], 200); - } catch (\Exception $e) { + } catch (Exception $e) { session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Admin'])); } } From 09cfa77378992655912454c20c1252abec743225 Mon Sep 17 00:00:00 2001 From: moe2566 Date: Wed, 24 Jul 2019 10:19:50 -0400 Subject: [PATCH 7/8] Update anonymous-master.blade.php --- .../src/Resources/views/layouts/anonymous-master.blade.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php index 572fae4be..1cc7a63d9 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php @@ -1,8 +1,7 @@ @php $locale = Webkul\Core\Models\Locale::where('code', app()->getLocale())->first(); @endphp - -@endphp + @@ -136,4 +135,4 @@
- \ No newline at end of file + From c6f44daa22631b49a556c18ded905bdcc8946415 Mon Sep 17 00:00:00 2001 From: Adrian Perez Date: Sun, 28 Jul 2019 15:34:57 +0200 Subject: [PATCH 8/8] Update README.md Update the backers link and image --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0797da47e..28af95aee 100755 --- a/README.md +++ b/README.md @@ -178,15 +178,17 @@ Bagisto is a truly opensource E-Commerce framework which will always be free und ### Miscellaneous -#### Contributors and Backers +#### Contributors This project is on [Open Collective](https://opencollective.com/bagisto) and it exists thanks to this people who contribute. +#### Backers + Thank you to all our backers! 🙏 - + #### Sponsors