Skip to content

Commit 2fe2b2c

Browse files
indpurveshindpurvesh
authored
Merge pull request #264 from avored/dev
merging dev to master
2 parents a6ef2e1 + 867eae4 commit 2fe2b2c

File tree

6 files changed

+44
-40
lines changed

6 files changed

+44
-40
lines changed

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## 2.9.5.8
5+
- HotFix AvoRed DataGrid Collection doesn't exist order by method only works for Eloquent Model
6+
- HotFix AvoRed Cart Page Sessing class missing
7+
- Added support for currency symbol
8+
49
## 2.9.5.7
510

611
### Added

‎themes/avored/default/views/cart/view.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<td class="col-1 text-right">
4444
<h6>
4545
<strong>
46-
{{ Session::get('currency_code') . number_format((Cart::taxTotal()), 2) }}
46+
{{ Cart::taxTotal() }}
4747
</strong>
4848
</h6>
4949
</td>
@@ -59,7 +59,7 @@
5959
</td>
6060
<td class="col-1 text-right">
6161
<h6>
62-
<strong>{{ Session::get('currency_code') . number_format((Cart::total()), 2) }}</strong>
62+
<strong>{{ Cart::total() }}</strong>
6363
</h6>
6464
</td>
6565
</tr>

‎themes/avored/default/views/checkout/cards/shopping-cart.blade.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545

4646
<td class="text-right hidden-xs">{{ $cartItem->qty() }}</td>
4747
<td class="text-right hidden-xs">
48-
{{ Session::get('currency_code') . $cartItem->priceFormat() }}
48+
{{ Session::get('currency_symbol') . $cartItem->priceFormat() }}
4949
</td>
5050
<td class="text-right">
51-
{{ Session::get('currency_code') . $cartItem->lineTotal() }}
51+
{{ Session::get('currency_symbol') . $cartItem->lineTotal() }}
5252
</td>
5353
</tr>
5454

@@ -63,20 +63,20 @@
6363
<tr>
6464
<td colspan="3" class="text-right hidden-xs"><strong>Sub-Total:</strong></td>
6565
<td class="text-right sub-total"
66-
data-sub-total="{{ number_format(Cart::total(), 2) }}">
67-
{{ Session::get('currency_code') . number_format(Cart::total(), 2) }}</td>
66+
data-sub-total="{{ Cart::total($formate = false) }}">
67+
{{ Cart::total() }}</td>
6868
</tr>
6969
<tr class="hidden shipping-row">
7070
<td colspan="3" class="text-right shipping-title hidden-xs"
7171
style="font-weight: bold;">Shipping Option
7272
</td>
73-
<td class="text-right shipping-cost" data-shipping-cost="0.00">{{ Session::get('currency_code') }}</td>
73+
<td class="text-right shipping-cost" data-shipping-cost="0.00">{{ Session::get('currency_symbol') }}</td>
7474
</tr>
7575

7676
<tr>
7777
<td colspan="3" class="text-right hidden-xs"><strong>Total:</strong></td>
78-
<td class="text-right total" data-total="{{ number_format(Cart::total(), 2) }}">
79-
{{ Session::get('currency_code') . number_format(Cart::total(), 2) }}</td>
78+
<td class="text-right total" data-total="{{ Cart::total($formate = false) }}">
79+
{{ Cart::total() }}</td>
8080
</tr>
8181
</tfoot>
8282

‎themes/avored/default/views/layouts/nav.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<li class="nav-item dropdown" >
4242
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">
4343

44-
Currency : {{ Session::get('currency_code')}}
44+
Currency : {{ Session::get('currency_symbol')}}
4545
</a>
4646
<div class="dropdown-menu">
4747
@foreach($currencies as $siteCurrencyId => $currencyCode)

‎themes/avored/default/views/product/view.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<div class="col-8">
1919
<h1 class="product-name">{{ $product->name }}</h1>
2020
<div class="product-price">
21-
<span>{{ Session::get('currency_code') }}</span>
21+
<span>{{ Session::get('currency_symbol') }}</span>
2222
<span class="price">{{ number_format($product->price,2) }}</span>
2323
</div>
2424

‎themes/avored/default/views/product/view/product-card.blade.php

+28-29
Original file line numberDiff line numberDiff line change
@@ -14,51 +14,50 @@
1414
</h3>
1515

1616
<p class="product-price">
17-
{{ Session::get('currency_code') }} {{ number_format($product->price,2) }}
17+
{{ Session::get('currency_symbol') }} {{ number_format($product->price,2) }}
1818
</p>
1919

2020
<div>
2121

2222
@if($product->qty >= 0)
2323
<form method="post" action="{{ route('cart.add-to-cart') }}">
24-
{{ csrf_field() }}
24+
@csrf
2525

26+
<input type="hidden" name="slug" value="{{ $product->slug }}"/>
2627

27-
<input type="hidden" name="slug" value="{{ $product->slug }}"/>
28-
29-
<div class="product-stock">In Stock</div>
30-
<hr>
31-
32-
<div class="clearfix"></div>
33-
<div class="float-left" style="margin-right: 5px;">
34-
<button type="submit" class="btn btn-primary"
35-
href="{{ route('cart.add-to-cart', $product->id) }}">
36-
Add to Cart
37-
</button>
38-
</div>
39-
</form>
40-
41-
@else
42-
<div class="product-stock text-danger ">Out of Stock</div>
28+
<div class="product-stock">In Stock</div>
4329
<hr>
4430

4531
<div class="clearfix"></div>
4632
<div class="float-left" style="margin-right: 5px;">
47-
<button type="button" disabled class="btn btn-default">
33+
<button type="submit" class="btn btn-primary"
34+
href="{{ route('cart.add-to-cart', $product->id) }}">
4835
Add to Cart
4936
</button>
5037
</div>
51-
@endif
38+
</form>
39+
40+
@else
41+
<div class="product-stock text-danger ">Out of Stock</div>
42+
<hr>
43+
44+
<div class="clearfix"></div>
45+
<div class="float-left" style="margin-right: 5px;">
46+
<button type="button" disabled class="btn btn-default">
47+
Add to Cart
48+
</button>
49+
</div>
50+
@endif
5251

53-
@if(Auth::check() && Auth::user()->isInWishlist($product->id))
54-
<a class="btn btn-danger" title="Remove from Wish List"
55-
data-toggle="tooltip" href="{{ route('my-account.wishlist.remove', $product->slug) }}">
56-
<i
57-
class="fa fa-heart"></i></a>
58-
@else
59-
<a class="btn btn-success" title="Add to Wish List" data-toggle="tooltip"
60-
href="{{ route('my-account.wishlist.add', $product->slug) }}"><i class="fa fa-heart"></i></a>
61-
@endif
52+
@if(Auth::check() && Auth::user()->isInWishlist($product->id))
53+
<a class="btn btn-danger" title="Remove from Wish List"
54+
data-toggle="tooltip" href="{{ route('my-account.wishlist.remove', $product->slug) }}">
55+
<i
56+
class="fa fa-heart"></i></a>
57+
@else
58+
<a class="btn btn-success" title="Add to Wish List" data-toggle="tooltip"
59+
href="{{ route('my-account.wishlist.add', $product->slug) }}"><i class="fa fa-heart"></i></a>
60+
@endif
6261
</div>
6362
</div>
6463
</div>

0 commit comments

Comments
 (0)