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

Merge pull request #806 from rahulshukla-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-04-05 16:57:59 +05:30 committed by GitHub
parent 4b73c3e980 ee189baf7a
commit cdd0e5c81f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/Webkul/Sales/src/Repositories/OrderItemRepository.php
View File

@ -56,7 +56,7 @@ class OrderItemRepository extends Repository
$totalInvoiced += $invoiceItem->total;
$baseTotalInvoiced += $invoiceItem->base_total;
$taxInvoiced += $invoiceItem->tax_amount;
$baseTaxInvoiced += $invoiceItem->base_tax_amount;
}
@ -70,7 +70,7 @@ class OrderItemRepository extends Repository
$orderItem->total_invoiced = $totalInvoiced;
$orderItem->base_total_invoiced = $baseTotalInvoiced;
$orderItem->tax_amount_invoiced = $taxInvoiced;
$orderItem->base_tax_amount_invoiced = $baseTaxInvoiced;
@ -97,7 +97,7 @@ class OrderItemRepository extends Repository
$orderedInventory = $product->ordered_inventories()
->where('channel_id', $orderItem->order->channel->id)
->first();
if ($orderedInventory) {
$orderedInventory->update([
'qty' => $orderedInventory->qty + $orderItem->qty_ordered
@ -128,7 +128,7 @@ class OrderItemRepository extends Repository
if (! $orderedInventory)
return ;
if (($qty = $orderedInventory->qty - $orderItem->qty_to_cancel) < 0) {
$qty = 0;
}

13
packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php
View File

@ -42,11 +42,13 @@
{{-- Uncomment the line below for activating share links --}}
{{-- @include('shop::products.sharelinks') --}}
@auth('customer')
<a class="add-to-wishlist" href="{{ route('customer.wishlist.add', $product->id) }}">
</a>
@endauth
</div>
</div>
</script>
@ -157,6 +159,17 @@
zoomImage.data('zoom-image', $(this).data('zoom-image'));
zoomImage.ezPlus();
});
$(document).mousemove(function(event) {
if ( (event.pageX - $('.product-hero-image').offset().left > 440 ) && (event.pageX - $('.product-hero-image').offset().left < 465) && (event.pageY - $('.product-hero-image').offset().top > 16) && (event.pageY - $('.product-hero-image').offset().top < 38)) {
$('.zoomContainer').attr('style', 'z-index: -1 !important');
} else {
$('.zoomContainer').css({"position": "absolute", "top": "143px", "left"
: "249px", "height": "480px", "width": "480px", "z-index": "999" });
}
});
})
</script>