a1gard
/
xshop
mirror of https://github.com/4xmen/xshop.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from 4xmen/master

Browse Source 
fixed some bugs
pull/16/head
A1Gard 11 months ago committed by GitHub
parent 5906b29f03 c8b0bb7a6d
commit 1e277dd9d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 49 deletions
Show Stats Download Patch File Download Diff File

1
app/Http/Requests/ProductSaveRequest.php
Unescape Escape View File

@ -30,6 +30,7 @@ class ProductSaveRequest extends FormRequest
//
// 'name' => ['required', 'string', 'min:5', 'max:128','unique:products,name,'.$this->name],
'name' => ['required', 'string', 'min:5', 'max:128',Rule::unique('products')->ignore($this->id)],
'sku' => ['nullable', 'string', 'min:1', 'max:128',Rule::unique('products')->ignore($this->id)],
'body' => ['nullable', 'string', 'min:5'],
'excerpt' => ['required', 'string', 'min:5'],
'active'=>['nullable','boolean'],

2
app/Observers/ProductObserver.php
Unescape Escape View File

@ -10,7 +10,7 @@ class ProductObserver
//
public function updated(Product $product){
\Log::info('product update');
if ($product->wasChanged('price')){
if ($product->wasChanged('price') && $p->price != null){
\Log::info('product price update');
$p = new Price();
$p->product_id = $product->id;

99
resources/views/admin/setting.blade.php
Unescape Escape View File

@ -20,60 +20,63 @@
</label>
@switch($set->type)
@case('longtext')
<textarea name="{{$set->key}}" id="{{$set->key}}" class="form-control"
rows="5">{{$set->value}}</textarea>
@break
<textarea name="{{$set->key}}" id="{{$set->key}}" class="form-control"
rows="5">{{$set->value}}</textarea>
@break
@case('checkbox')
<div class="row">
<div class="col-md">
<div class="row">
<div class="col-md">
</div>
<div class="col-md">
<label>
<input type="radio" name="{{$set->key}}"
@if($set->value == 'yes') checked @endif value="yes">
{{__("Yes")}}
</label>
</div>
<div class="col-md">
<label>
<input type="radio" name="{{$set->key}}" value="no"
@if($set->value == 'no') checked @endif>
{{__("No")}}
</label>
</div>
</div>
<div class="col-md">
<label>
<input type="radio" name="{{$set->key}}" @if($set->value == 'yes') checked @endif value="yes">
{{__("Yes")}}
</label>
</div>
<div class="col-md">
<label>
<input type="radio" name="{{$set->key}}" value="no" @if($set->value == 'no') checked @endif>
{{__("No")}}
</label>
</div>
</div>
@break
@break
@case('code')
<textarea dir="ltr" name="{{$set->key}}" id="{{$set->key}}" class="form-control"
rows="5">{{$set->value}}</textarea>
@break
<textarea dir="ltr" name="{{$set->key}}" id="{{$set->key}}" class="form-control"
rows="5">{{$set->value}}</textarea>
@break
@case('editor')
<textarea name="{{$set->key}}" id="{{$set->key}}" class="ckeditor form-control"
rows="5">{{$set->value}}</textarea>
@break
<textarea name="{{$set->key}}" id="{{$set->key}}" class="ckeditor form-control"
rows="5">{{$set->value}}</textarea>
@break
@case('category')
<select name="{{$set->key}}" id="{{$set->key}}" class="form-control">
@foreach($cats as $cat )
<option @if (old($set->key,$set->value??null) == $cat->id ) selected
@endif value="{{$cat->id }}"> {{$cat->name}} </option>
@endforeach
</select>
@break
<select name="{{$set->key}}" id="{{$set->key}}" class="form-control">
@foreach($cats as $cat )
<option @if (old($set->key,$set->value??null) == $cat->id ) selected
@endif value="{{$cat->id }}"> {{$cat->name}} </option>
@endforeach
</select>
@break
@case('cat')
<select name="{{$set->key}}" id="{{$set->key}}" class="form-control">
@foreach($pcats as $cat )
<option @if (old($set->key,$set->value??null) == $cat->id ) selected
@endif value="{{$cat->id }}"> {{$cat->name}} </option>
@endforeach
</select>
@break
<select name="{{$set->key}}" id="{{$set->key}}" class="form-control">
@foreach($pcats as $cat )
<option @if (old($set->key,$set->value??null) == $cat->id ) selected
@endif value="{{$cat->id }}"> {{$cat->name}} </option>
@endforeach
</select>
@break
@case('image')
<img src="{{asset('images/'.str_replace('_','.',$set->key))}}" style="max-height: 150px" alt="cover">
<input type="file" name="pic[{{$set->key}}]" id="{{$set->key}}"
accept="image/*"
class="form-control-file"/>
@break
<img src="{{asset('images/'.str_replace('_','.',$set->key))}}?{{time()}}"
class="img-fluid" style="max-height: 150px;max-width: 45%" alt="cover">
<input type="file" name="pic[{{$set->key}}]" id="{{$set->key}}"
accept="image/*"
class="form-control-file"/>
@break
@default
<input type="{{$set->type}}" name="{{$set->key}}" id="{{$set->key}}"
class="form-control" value="{{$set->value}}"/>
<input type="{{$set->type}}" name="{{$set->key}}" id="{{$set->key}}"
class="form-control" value="{{$set->value}}"/>
@endswitch
</div>
</div>
@ -82,8 +85,8 @@
</li>
@endforeach
<li class="list-group-item">
<input type="submit" value="{{__("Save")}}" class="btn btn-primary" />
<input type="reset" value="{{__("Reset")}}" class="btn btn-secondary" />
<input type="submit" value="{{__("Save")}}" class="btn btn-primary"/>
<input type="reset" value="{{__("Reset")}}" class="btn btn-secondary"/>
</li>
</ul>
</form>

Write Preview
Loading…
Cancel
Save