Commit Graph

4776 Commits

Author SHA1 Message Date
ghermans bb9c90d0a2 #2525 Added locale, timezone and currency 2020-02-25 03:29:33 +01:00
Glenn Hermans 5df38b73a4
Merge pull request #4 from bagisto/master
Merge with original repo
2020-02-24 20:55:10 +01:00
Glenn Hermans 9de680c47d
Fix conflicts 2020-02-24 17:49:43 +01:00
Jitendra Singh 9eb7113aa4 Fixed else if indentation in javascript 2020-02-24 18:53:34 +05:30
Annika Wolff 1691151683 entered translation keys 2020-02-24 13:57:24 +01:00
Jitendra Singh 195eb82802 Replace else if with elseif 2020-02-24 17:49:12 +05:30
Jitendra Singh 95d198c1d6 Fixed merge cart issue for booking product 2020-02-24 16:40:44 +05:30
Jitendra Singh 3cee45b4a5
Merge pull request #2548 from rahulshukla-webkul/development
laguage updated for order
2020-02-24 15:06:15 +05:30
rahul shukla 10d8ec249a laguage updated for order 2020-02-24 15:04:18 +05:30
Jitendra Singh fe3e757a23
Merge pull request #2547 from rahulshukla-webkul/development
change log updated for 1.x.x
2020-02-24 14:57:42 +05:30
rahul shukla b1f34c095a date updated in changelog 2020-02-24 14:39:42 +05:30
rahul shukla 19016b4076 change log updated for 1.x.x 2020-02-24 14:35:51 +05:30
Jitendra Singh c52e19d53d
Merge pull request #2546 from rahulshukla-webkul/development
Development
2020-02-24 13:47:58 +05:30
Jitendra Singh 8bdadf7a38
Merge pull request #2545 from shubhwebkul/bug-fixes
[Velocity] product view page add to cart button issue resolved
2020-02-24 13:46:38 +05:30
rahul shukla 8fa7bc8c10 Issue #2451 fixed 2020-02-24 13:45:11 +05:30
shubhammehrotra.symfony@webkul.com 9b2dc0b8c7 product view add to cart button issue resolved 2020-02-24 13:43:21 +05:30
Jitendra Singh e552183e9a
Merge pull request #2523 from ghermans/dutch
#2512 - Dutch translations and removing static text
2020-02-24 13:34:27 +05:30
rahul shukla e927ebd821 product name issue 2020-02-24 12:31:18 +05:30
Jitendra Singh 6fc2f78f52
Merge pull request #2544 from rahulshukla-webkul/development
Uncomment code
2020-02-24 11:33:08 +05:30
rahul shukla ab956a2a79 remove comment 2020-02-24 11:23:02 +05:30
Glenn Hermans c076c658e2
Fixed view 2020-02-22 15:17:42 +01:00
Glenn Hermans ea69a74443
Added translations 2020-02-22 15:15:55 +01:00
Glenn Hermans e3413d5f45
Updated shipments table view 2020-02-22 15:15:09 +01:00
Glenn Hermans d25c9bbec0
Merge pull request #2 from bagisto/master
Update from original repo
2020-02-22 15:03:17 +01:00
Glenn Hermans 6f6f1c66a5 translations 2020-02-21 17:09:26 +01:00
Jitendra Singh 5c696f8d00 Resolved conflicts 2020-02-21 19:36:17 +05:30
Jitendra Singh 2e24c2e2e5 Updated event booking system 2020-02-21 19:13:15 +05:30
Jitendra Singh 1b37a5f796
Merge pull request #2539 from rahulshukla-webkul/development
Issue #2538 fixed and change log updated
2020-02-21 17:51:22 +05:30
rahul shukla 30cb18c1f5 Issue #2538 fixed and change log updated 2020-02-21 17:45:47 +05:30
Jitendra Singh af01fa6103
Merge pull request #2536 from rahulshukla-webkul/development
post code in shipping address
2020-02-21 17:24:55 +05:30
Glenn Hermans 0f233f08fe Updating translations 2020-02-21 12:36:26 +01:00
rahul shukla 253ac52cc1 post code in shipping address 2020-02-21 16:56:57 +05:30
Jitendra Singh 84e826d1a0
Merge pull request #2535 from rahulshukla-webkul/development
tax in velocity theme
2020-02-21 16:32:27 +05:30
Glenn Hermans fc84c4a047 #2512 - Added more shop translations 2020-02-21 11:23:46 +01:00
rahul shukla 78e50e4e6b tax in velocity theme 2020-02-21 15:38:42 +05:30
Jitendra Singh 24e69e2cd9
Merge pull request #2247 from Haendlerbund/fix-tax-handling
Fix tax handling
2020-02-21 15:20:35 +05:30
Jitendra Singh 6396194862
Merge pull request #2534 from rahulshukla-webkul/development
Issue #2533 fixed and change log updated
2020-02-21 15:10:42 +05:30
rahul shukla a4b3316b29 Issue #2533 fixed and change log updated 2020-02-21 14:41:42 +05:30
ghermans d4ce50da9f #2512 more translations 2020-02-21 09:44:12 +01:00
ghermans 283c6e437c #2512 starting to translate the shop files 2020-02-21 09:30:04 +01:00
Annika Wolff d50510a626 resolve merge issue, add type hints in Cart helper function 2020-02-21 08:36:52 +01:00
Jitendra Singh 35522da97d
Merge pull request #2532 from rahulshukla-webkul/development
change log updated
2020-02-21 12:02:47 +05:30
rahul shukla 5ad6afd298 change log updated 2020-02-21 11:58:33 +05:30
Jitendra Singh f9c608bbda
Merge pull request #2521 from Haendlerbund/improve-cart-item-validation
Automated test for Cart Rule Creation in Admin Backend
2020-02-21 11:29:34 +05:30
Jitendra Singh e0b61c8a58
Merge pull request #2524 from SteffenMahler/patch-2
Fire event if customer wants to "buy now"
2020-02-21 11:29:17 +05:30
Jitendra Singh fa68e2ad2a
Merge pull request #2531 from rahulshukla-webkul/development
cart product quantity for bundle product in velocity and change log …
2020-02-21 11:03:01 +05:30
rahul shukla c87562622b cart product quantitiy for bundle product in velocity and change log updated 2020-02-21 10:53:59 +05:30
ghermans 22f5391f5c More translations 2020-02-21 01:48:25 +01:00
ghermans 6174a78926 More translations 2020-02-21 01:16:32 +01:00
ghermans 89ebea48e6 removed spacing 2020-02-20 20:24:39 +01:00