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

Cart issues fixed

This commit is contained in:
jitendra 2018-10-18 15:21:08 +05:30
parent 70c47f44a9
commit 1d5e1f5a21
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,9 +61,9 @@
</td>
<td>
<div class="control-group" :class="[errors.has('ratio') ? 'has-error' : '']">
<input v-validate="'required'" class="control" id="ratio" name="ratio" value="{{ old('ratio') ?: $exchangeRate->ratio }}"/>
<span class="control-error" v-if="errors.has('ratio')">@{{ errors.first('ratio') }}</span>
<div class="control-group" :class="[errors.has('rate') ? 'has-error' : '']">
<input v-validate="'required'" class="control" id="rate" name="rate" value="{{ old('rate') ?: $exchangeRate->rate }}"/>
<span class="control-error" v-if="errors.has('rate')">@{{ errors.first('rate') }}</span>
</div>
</td>
<tr>

2
packages/Webkul/Core/src/Database/Migrations/2018_07_20_054542_create_currency_exchange_rates_table.php
View File

@ -17,7 +17,7 @@ class CreateCurrencyExchangeRatesTable extends Migration
$table->increments('id');
$table->decimal('rate', 10, 5);
$table->integer('target_currency')->unsigned();
$table->integer('target_currency')->unique()->unsigned();
$table->foreign('target_currency')->references('id')->on('currencies')->onDelete('cascade');
$table->timestamps();
});

6
packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
View File

@ -85,7 +85,7 @@ class ExchangeRateController extends Controller
public function store(Request $request)
{
$this->validate(request(), [
'target_currency' => 'required',
'target_currency' => ['required', 'unique:currency_exchange_rates,target_currency'],
'rate' => 'required|numeric'
]);
@ -121,8 +121,8 @@ class ExchangeRateController extends Controller
public function update(Request $request, $id)
{
$this->validate(request(), [
'target_currency' => 'required',
'ratio' => 'required|numeric'
'target_currency' => ['required', 'unique:currency_exchange_rates,target_currency,' . $id],
'rate' => 'required|numeric'
]);
$this->exchangeRate->update(request()->all(), $id);

14
packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
View File

@ -28,26 +28,30 @@
@foreach($cart->items as $item)
<?php
$product = $item->product;
$productBaseImage = $productImageHelper->getProductBaseImage($product);
if($item->type == "configurable")
$productBaseImage = $productImageHelper->getProductBaseImage($item->child->product);
else
$productBaseImage = $productImageHelper->getProductBaseImage($item->product);
?>
<div class="item">
<div style="margin-right: 15px;">
<a href="{{ url()->to('/').'/products/'.$product->url_key }}"><img class="item-image" src="{{ $productBaseImage['medium_image_url'] }}" /></a>
<a href="{{ url()->to('/').'/products/'.$item->product->url_key }}"><img class="item-image" src="{{ $productBaseImage['medium_image_url'] }}" /></a>
</div>
<div class="item-details">
<div class="item-title">
<a href="{{ url()->to('/').'/products/'.$product->url_key }}">{{ $product->name }}</a>
<a href="{{ url()->to('/').'/products/'.$item->product->url_key }}">
{{ $item->product->name }}
</a>
</div>
<div class="price">
{{ core()->currency($item->base_price) }}
</div>
@if ($product->type == 'configurable')
@if ($item->type == 'configurable')
<div class="summary">