Skip to content

Commit 96b7f05

Browse files
1 parent 95161d9 commit 96b7f05

File tree

1,162 files changed

+2162
-74
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,162 files changed

+2162
-74
lines changed

CHANGELOG for v0.1.x.md

100644100755
File mode changed.

README.md

100644100755
File mode changed.

app/Console/Kernel.php

100644100755
File mode changed.

app/Exceptions/Handler.php

100644100755
File mode changed.

app/Http/Controllers/Controller.php

100644100755
File mode changed.

app/Http/Kernel.php

100644100755
File mode changed.

app/Http/Middleware/EncryptCookies.php

100644100755
File mode changed.

app/Http/Middleware/RedirectIfAuthenticated.php

100644100755
File mode changed.

app/Http/Middleware/TrimStrings.php

100644100755
File mode changed.

app/Http/Middleware/TrustProxies.php

100644100755
File mode changed.

app/Http/Middleware/VerifyCsrfToken.php

100644100755
File mode changed.

app/Providers/AppServiceProvider.php

100644100755
File mode changed.

app/Providers/AuthServiceProvider.php

100644100755
File mode changed.

app/Providers/BroadcastServiceProvider.php

100644100755
File mode changed.

app/Providers/EventServiceProvider.php

100644100755
File mode changed.

app/Providers/RouteServiceProvider.php

100644100755
File mode changed.

artisan

100644100755
File mode changed.

bootstrap/app.php

100644100755
File mode changed.

bower.json

100644100755
File mode changed.

composer.json

100644100755
File mode changed.

config/acl.php

100644100755
File mode changed.

config/app.php

100644100755
File mode changed.

config/auth.php

100644100755
File mode changed.

config/broadcasting.php

100644100755
File mode changed.

config/cache.php

100644100755
File mode changed.

config/carriers.php

100644100755
File mode changed.

config/concord.php

100644100755
File mode changed.

config/core.php

100644100755
File mode changed.

config/database.php

100644100755
File mode changed.

config/db-blade-compiler.php

100644100755
File mode changed.

config/debugbar.php

100644100755
File mode changed.

config/dompdf.php

100644100755
File mode changed.

config/excel.php

100644100755
File mode changed.

config/filesystems.php

100644100755
File mode changed.

config/hashing.php

100644100755
File mode changed.

config/image.php

100644100755
File mode changed.

config/imagecache.php

100644100755
File mode changed.

config/logging.php

100644100755
File mode changed.

config/mail.php

100644100755
File mode changed.

config/menu.php

100644100755
File mode changed.

config/modules.php

100644100755
File mode changed.

config/paymentmethods.php

100644100755
File mode changed.

config/queue.php

100644100755
File mode changed.

config/repository.php

100644100755
File mode changed.

config/services.php

100644100755
File mode changed.

config/session.php

100644100755
File mode changed.

config/themes.php

100644100755
File mode changed.

config/tinker.php

100644100755
File mode changed.

config/translatable.php

100644100755
File mode changed.

config/trustedproxy.php

100644100755
File mode changed.

config/view.php

100644100755
File mode changed.

database/.gitignore

100644100755
File mode changed.

database/factories/UserFactory.php

100644100755
File mode changed.

database/migrations/2014_10_12_000000_create_users_table.php

100644100755
File mode changed.

database/migrations/2014_10_12_100000_create_password_resets_table.php

100644100755
File mode changed.

database/seeds/DatabaseSeeder.php

100644100755
File mode changed.

migration guide.md

100644100755
File mode changed.

package.json

100644100755
File mode changed.

packages/Webkul/API/Http/Controllers/Controller.php

100644100755
File mode changed.

packages/Webkul/API/Http/Controllers/Customer/AddressController.php

100644100755
File mode changed.

packages/Webkul/API/Http/Controllers/Customer/AuthController.php

100644100755
File mode changed.

packages/Webkul/API/Http/Controllers/Customer/CustomerController.php

100644100755
File mode changed.

packages/Webkul/API/Http/Controllers/Customer/RegistrationController.php

100644100755
File mode changed.

packages/Webkul/API/Http/Controllers/Customer/WishlistController.php

100644100755
File mode changed.

packages/Webkul/API/Http/Controllers/Product/ProductController.php

100644100755
File mode changed.

packages/Webkul/API/Http/Controllers/Product/ReviewController.php

100644100755
File mode changed.

packages/Webkul/API/Http/Controllers/Shop/CartController.php

100644100755
File mode changed.

packages/Webkul/API/Http/Controllers/Shop/CategoryController.php

100644100755
File mode changed.

packages/Webkul/API/Http/Controllers/Shop/Presenter.php

100644100755
File mode changed.

packages/Webkul/API/Http/api.php

100644100755
File mode changed.

packages/Webkul/API/Providers/APIServiceProvider.php

100644100755
File mode changed.

packages/Webkul/API/composer.json

100644100755
File mode changed.

packages/Webkul/Admin/.gitignore

100644100755
File mode changed.

packages/Webkul/Admin/composer.json

100644100755
File mode changed.

packages/Webkul/Admin/package.json

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/css/admin.css

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/images/Angle-Right.svg

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/images/Icon-Graph-Green.svg

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/admin.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/advlist/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/anchor/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/autolink/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/autoresize/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/autosave/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/bbcode/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/charmap/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/code/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/codesample/css/prism.css

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/codesample/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/contextmenu/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/directionality/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-cool.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-cry.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-embarassed.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-foot-in-mouth.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-frown.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-innocent.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-kiss.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-laughing.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-money-mouth.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-sealed.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-smile.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-surprised.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-tongue-out.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-undecided.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-wink.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/img/smiley-yell.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/emoticons/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/fullpage/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/fullscreen/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/help/img/logo.png

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/help/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/hr/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/image/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/imagetools/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/importcss/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/insertdatetime/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/legacyoutput/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/link/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/lists/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/media/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/mention/plugin.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/mention/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/mention/plugin.min.js.real

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/nonbreaking/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/noneditable/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/pagebreak/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/paste/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/preview/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/print/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/save/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/searchreplace/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/spellchecker/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/tabfocus/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/table/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/template/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/textcolor/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/textpattern/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/toc/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/visualblocks/css/visualblocks.css

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/visualblocks/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/visualchars/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/plugins/wordcount/plugin.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/content.inline.min.css

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/content.min.css

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce-small.eot

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce-small.svg

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce-small.ttf

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce-small.woff

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce.eot

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce.svg

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce.ttf

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/fonts/tinymce.woff

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/img/anchor.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/img/loader.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/img/object.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/img/trans.gif

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/skins/lightgray/skin.min.css

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/themes/inlite/theme.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/themes/modern/theme.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/js/tinyMCE/tinymce.min.js

100644100755
File mode changed.

packages/Webkul/Admin/publishable/assets/mix-manifest.json

100644100755
File mode changed.

packages/Webkul/Admin/src/Config/acl.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Config/menu.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Config/product_form_accordians.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/CountryDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/DataGrids/UserDataGrid.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Database/Seeders/DatabaseSeeder.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Exceptions/Handler.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Exports/DataGridExport.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php

100644100755
+8-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44

55
use Illuminate\Http\Request;
66
use Illuminate\Http\Response;
7+
use Illuminate\Support\Facades\Event;
78
use Webkul\Admin\Facades\Configuration;
89
use Webkul\Core\Repositories\CoreConfigRepository as CoreConfig;
910
use Webkul\Core\Tree;
11+
use Webkul\Admin\Http\Requests\ConfigurationForm;
1012

1113
/**
1214
* Configuration controller
@@ -126,12 +128,17 @@ public function getDefaultConfigSlugs()
126128
/**
127129
* Store a newly created resource in storage.
128130
*
131+
* @param \Webkul\Admin\Http\Requests\ConfigurationForm $request
129132
* @return \Illuminate\Http\Response
130133
*/
131-
public function store()
134+
public function store(ConfigurationForm $request)
132135
{
136+
Event::fire('core.configuration.save.after');
137+
133138
$this->coreConfig->create(request()->all());
134139

140+
Event::fire('core.configuration.save.after');
141+
135142
session()->flash('success', 'Shipping Method is created successfully');
136143

137144
return redirect()->back();

packages/Webkul/Admin/src/Http/Controllers/Controller.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Http/Controllers/DashboardController.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Http/Controllers/DataGridController.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Http/Controllers/ExportController.php

100644100755
+2-2
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public function export()
3636

3737
$file_name = class_basename($results);
3838

39-
if(request()->all()['format'] == 'csv') {
39+
if (request()->all()['format'] == 'csv') {
4040
return Excel::download(new DataGridExport($results), $file_name.'.csv');
41-
}else {
41+
} else {
4242
return Excel::download(new DataGridExport($results), $file_name.'.xlsx');
4343
}
4444
}

packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php

100644100755
File mode changed.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
3+
namespace Webkul\Admin\Http\Requests;
4+
5+
use Illuminate\Foundation\Http\FormRequest;
6+
use Illuminate\Validation\Rule;
7+
8+
class ConfigurationForm extends FormRequest
9+
{
10+
/**
11+
* Determine if the Configuraion is authorized to make this request.
12+
*
13+
* @return bool
14+
*/
15+
public function authorize()
16+
{
17+
return true;
18+
}
19+
20+
/**
21+
* Get the validation rules that apply to the request.
22+
*
23+
* @return array
24+
*/
25+
public function rules()
26+
{
27+
$this->rules = [
28+
'sales.*.*.title' => 'required',
29+
'sales.*.*.active' => 'required',
30+
'sales.*.*.order_status' => 'required',
31+
];
32+
33+
return $this->rules;
34+
}
35+
36+
/**
37+
* Get the error messages for the defined validation rules.
38+
*
39+
* @return array
40+
*/
41+
public function messages()
42+
{
43+
return [
44+
'sales.*.*.title.required' => 'The title field is required.',
45+
'sales.*.*.active.required' => 'The status field is required.',
46+
'sales.*.*.order_status.required' => 'Order Status field is required',
47+
];
48+
}
49+
}

packages/Webkul/Admin/src/Http/routes.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Listeners/Order.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Listeners/Product.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Mail/NewOrderNotification.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Mail/NewShipmentNotification.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Providers/.gitkeep

100644100755
File mode changed.

packages/Webkul/Admin/src/Providers/AdminServiceProvider.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Providers/EventServiceProvider.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/assets/.gitkeep

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/assets/images/Angle-Right.svg

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/assets/images/Icon-Graph-Green.svg

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/assets/js/app.js

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/assets/js/bootstrap.js

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/assets/sass/_mixins.scss

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/assets/sass/_variables.scss

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/assets/sass/app.scss

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/lang/en/app.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/.gitkeep

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/account/edit.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/attributes/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/categories/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/families/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/categories.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/images.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/product-links.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/variations.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/boolean.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/date.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/datetime.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/multiselect.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/price.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/select.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/text.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/field-types/textarea.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/customers/confirm-password.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/customers/country-state.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/customers/create.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/customers/groups/create.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/customers/groups/edit.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/customers/groups/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/customers/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/customers/reviews/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/customers/subscribers/edit.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/customers/subscribers/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/errors/401.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/errors/403.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/errors/404.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/errors/500.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/export/export.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/layouts/content.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/layouts/system.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/sales/address.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php

100644100755
+32-20
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<tabs>
4141
<tab name="{{ __('admin::app.sales.orders.info') }}" :selected="true">
4242
<div class="sale-container">
43-
43+
4444
<accordian :title="'{{ __('admin::app.sales.orders.order-and-account') }}'" :active="true">
4545
<div slot="body">
4646

@@ -51,11 +51,11 @@
5151

5252
<div class="section-content">
5353
<div class="row">
54-
<span class="title">
54+
<span class="title">
5555
{{ __('admin::app.sales.orders.order-date') }}
5656
</span>
5757

58-
<span class="value">
58+
<span class="value">
5959
{{ $order->created_at }}
6060
</span>
6161
</div>
@@ -64,7 +64,7 @@
6464
<span class="title">
6565
{{ __('admin::app.sales.orders.order-status') }}
6666
</span>
67-
67+
6868
<span class="value">
6969
{{ $order->status_label }}
7070
</span>
@@ -74,7 +74,7 @@
7474
<span class="title">
7575
{{ __('admin::app.sales.orders.channel') }}
7676
</span>
77-
77+
7878
<span class="value">
7979
{{ $order->channel_name }}
8080
</span>
@@ -89,24 +89,36 @@
8989

9090
<div class="section-content">
9191
<div class="row">
92-
<span class="title">
92+
<span class="title">
9393
{{ __('admin::app.sales.orders.customer-name') }}
9494
</span>
9595

96-
<span class="value">
96+
<span class="value">
9797
{{ $order->customer_full_name }}
9898
</span>
9999
</div>
100100

101101
<div class="row">
102-
<span class="title">
102+
<span class="title">
103103
{{ __('admin::app.sales.orders.email') }}
104104
</span>
105105

106-
<span class="value">
106+
<span class="value">
107107
{{ $order->customer_email }}
108108
</span>
109109
</div>
110+
111+
@if(!is_null($order->customer))
112+
<div class="row">
113+
<span class="title">
114+
{{ __('admin::app.customers.customers.customer_group') }}
115+
</span>
116+
117+
<span class="value">
118+
{{ $order->customer->customerGroup['name'] }}
119+
</span>
120+
</div>
121+
@endif
110122
</div>
111123
</div>
112124

@@ -137,11 +149,11 @@
137149
<div class="section-content">
138150

139151
@include ('admin::sales.address', ['address' => $order->shipping_address])
140-
152+
141153
</div>
142154
</div>
143155
@endif
144-
156+
145157
</div>
146158
</accordian>
147159

@@ -155,21 +167,21 @@
155167

156168
<div class="section-content">
157169
<div class="row">
158-
<span class="title">
170+
<span class="title">
159171
{{ __('admin::app.sales.orders.payment-method') }}
160172
</span>
161173

162-
<span class="value">
174+
<span class="value">
163175
{{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }}
164176
</span>
165177
</div>
166178

167179
<div class="row">
168-
<span class="title">
180+
<span class="title">
169181
{{ __('admin::app.sales.orders.currency') }}
170182
</span>
171183

172-
<span class="value">
184+
<span class="value">
173185
{{ $order->order_currency_code }}
174186
</span>
175187
</div>
@@ -183,21 +195,21 @@
183195

184196
<div class="section-content">
185197
<div class="row">
186-
<span class="title">
198+
<span class="title">
187199
{{ __('admin::app.sales.orders.shipping-method') }}
188200
</span>
189201

190-
<span class="value">
202+
<span class="value">
191203
{{ $order->shipping_title }}
192204
</span>
193205
</div>
194206

195207
<div class="row">
196-
<span class="title">
208+
<span class="title">
197209
{{ __('admin::app.sales.orders.shipping-price') }}
198210
</span>
199211

200-
<span class="value">
212+
<span class="value">
201213
{{ core()->formatBasePrice($order->base_shipping_amount) }}
202214
</span>
203215
</div>
@@ -402,6 +414,6 @@
402414
</tab>
403415
</tabs>
404416
</div>
405-
417+
406418
</div>
407419
@stop

packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/sales/shipments/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/channels/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<div slot="body">
2929
<div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
3030
<label for="code" class="required">{{ __('admin::app.settings.currencies.code') }}</label>
31-
<input v-validate="'required'" class="control" id="code" name="code" value="{{ old('code') }}" data-vv-as="&quot;{{ __('admin::app.settings.currencies.code') }}&quot;" v-code/>
31+
<input v-validate="'required|min:3|max:3'" class="control" id="code" name="code" value="{{ old('code') }}" data-vv-as="&quot;{{ __('admin::app.settings.currencies.code') }}&quot;" style="text-transform:uppercase" v-code/>
3232
<span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
3333
</div>
3434

packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/currencies/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/create.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/locales/index.blade.php

100644100755
File mode changed.

packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php

100644100755
File mode changed.

0 commit comments

Comments
 (0)