merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/bagisto/bagisto

This commit is contained in:
Annika Wolff 2020-01-17 08:41:43 +01:00
parent 3fcb93fda7 880868738a
commit 840ae7b2d8
12 changed files with 7896 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -17,7 +17,6 @@ npm-debug.log
yarn-error.log
.env
/ignorables/*
composer.lock
yarn.lock
package-lock.json
yarn.lock

7885
composer.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

2
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

3
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=d1daece26673ab30942b",
"/css/admin.css": "/css/admin.css?id=c845e7c275d4df7fa03f"
"/js/admin.js": "/js/admin.js?id=7da533d2597c7e84df97",
"/css/admin.css": "/css/admin.css?id=9a8c6ebe5e08965b7ae6"
}

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

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
<title>Angle-Right</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Angle-Right" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<polyline id="Path-3" stroke="#A2A2A2" stroke-width="3" points="7 3 14 10.058476 7.11598308 17"></polyline>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 618 B

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

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
<title>Icon-Graph-Green</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Icon-Graph-Green" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g transform="translate(8.000000, 5.000000)" stroke="#00C357" stroke-width="2">
<path d="M4,0 L4,14" id="Path-2"></path>
<path d="M4,0 L0,4" id="Path-3"></path>
<path d="M7.92330631,0 L3.92330631,4" id="Path-3-Copy" transform="translate(5.961653, 2.000000) scale(-1, 1) translate(-5.961653, -2.000000) "></path>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 881 B

2
packages/Webkul/Admin/src/Resources/assets/js/app.js vendored
View File

@ -87,7 +87,7 @@ $(document).ready(function () {
},
addFlashMessages() {
if (typeof flashMessages !== 'undefined') {
if (typeof flashMessages == 'undefined') {
return;
};

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

@ -28,7 +28,7 @@
<div class="form-container">
@csrf()
{!! view_render_event('bagisto.admin.settings.locale.edit.before') !!}
{!! view_render_event('bagisto.admin.settings.locale.edit.before', ['locale' => $locale]) !!}
<input name="_method" type="hidden" value="PUT">
@ -60,7 +60,7 @@
</div>
</accordian>
{!! view_render_event('bagisto.admin.settings.locale.edit.after') !!}
{!! view_render_event('bagisto.admin.settings.locale.edit.after', ['locale' => $locale]) !!}
</div>
</div>
</form>

1
packages/Webkul/Admin/webpack.mix.js vendored
View File

@ -16,7 +16,6 @@ mix.setPublicPath(publicPath).mergeManifest();
mix.disableNotifications();
mix.js(__dirname + "/src/Resources/assets/js/app.js", "js/admin.js")
.copyDirectory( __dirname + '/src/Resources/assets/images', publicPath + '/images')
.sass(__dirname + "/src/Resources/assets/sass/app.scss", "css/admin.css")
.options({
processCssUrls: false

2
packages/Webkul/Core/src/Repositories/SliderRepository.php
View File

@ -55,7 +55,7 @@ class SliderRepository extends Repository
*/
public function save(array $data)
{
Event::fire('core.settings.slider.create.before', $id);
Event::fire('core.settings.slider.create.before', $data);
$channelName = $this->channelRepository->find($data['channel_id'])->name;

4
packages/Webkul/Shop/src/Http/Controllers/ReviewController.php
View File

@ -87,7 +87,7 @@ class ReviewController extends Controller
if (auth()->guard('customer')->user()) {
$data['customer_id'] = auth()->guard('customer')->user()->id;
$data['name'] = auth()->guard('customer')->user()->first_name .' ' . auth()->guard('customer')->user()->last_name;
$data['name'] = auth()->guard('customer')->user()->first_name . ' ' . auth()->guard('customer')->user()->last_name;
}
$data['status'] = 'pending';
@ -110,7 +110,7 @@ class ReviewController extends Controller
{
$product = $this->productRepository->findBySlugOrFail($slug);
return view($this->_config['view'],compact('product'));
return view($this->_config['view'], compact('product'));
}
/**