Commit Graph

4253 Commits

Author SHA1 Message Date
Florian Bosdorff 376ae65394 fix typo 2020-07-10 14:35:59 +02:00
Florian Bosdorff 43c4074bf7 improve performance when checking cart-rules 2020-07-10 08:18:42 +02:00
Jitendra Singh e2b941ff71
Merge pull request #3449 from rahulcs0082/development
Issue #3444 fixded
2020-07-08 17:27:09 +05:30
rahulshukla-home e19daf97c6 Issue #3444 fixded 2020-07-08 17:13:49 +05:30
Jitendra Singh 101414b59e
Merge pull request #3442 from jitendra-webkul/1.0
Issue #3423 fixed
2020-07-08 11:21:04 +05:30
jitendra e1c7506035 Issue #3423 fixed 2020-07-08 11:15:11 +05:30
rahulshukla-home 95f6526c5a Issue #3313 fixed 2020-07-08 11:11:30 +05:30
rahulshukla-home 7b5f2a6d0a Issue #3313 fixed 2020-07-07 17:30:40 +05:30
rahulshukla-home a1fadbfda4 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-07-07 15:40:27 +05:30
rahulshukla-home 2b9651fd77 Issue #3310 fixed 2020-07-07 15:39:58 +05:30
jitendra ec3a7c368b Resolved conflicts 2020-07-07 13:38:52 +05:30
jitendra 1eb2873588 Issue #3423 fixed 2020-07-07 13:36:14 +05:30
Jitendra Singh ce0ec932cd
Merge pull request #3435 from jitendra-webkul/1.0
Fixed issue in order view page if customer group is null
2020-07-07 12:38:59 +05:30
jitendra fdb214ec22 Fixed issue in order view page if customer group is null 2020-07-07 12:20:51 +05:30
Herbert Maschke ef99a1e981 properly pass the data array into the 'checkout.order.safe.before' event 2020-07-06 14:46:19 +02:00
Jitendra Singh 1b7b6f91bd
Merge pull request #3430 from rahulcs0082/development
Issue #3409 fixed
2020-07-06 17:02:19 +05:30
rahulshukla-home 4c76fb27e9 Issue #3409 fixed 2020-07-06 16:54:16 +05:30
Jitendra Singh 644dd975cf
Merge pull request #3429 from jitendra-webkul/1.0
Issue #3425 fixed
2020-07-06 13:35:27 +05:30
jitendra fa05bc8f0a Issue #3425 fixed 2020-07-06 13:22:46 +05:30
rahulshukla-home b53e0055e0 Issue #3423 2020-07-06 11:27:57 +05:30
rahulshukla-home 6d7df0616b issue #3426 fixed 2020-07-06 11:16:35 +05:30
rahulshukla-home 2dc3eba431 Issue #3417 fixed 2020-07-03 15:43:30 +05:30
rahulshukla-home e14772377f Issue #3411 fixed 2020-07-03 13:13:25 +05:30
Shubham Mehrotra 28f8b369d8 Merge branch 'master' of https://github.com/bagisto/bagisto 2020-07-03 12:15:34 +05:30
Shubham Mehrotra 9e03cd121b badge-design in rtl 2020-07-03 12:08:20 +05:30
Jitendra Singh 210c705ff0
Merge pull request #3410 from rahulcs0082/development
Issue #3394
2020-07-03 11:41:25 +05:30
Jitendra Singh 2b8a7003be
Merge pull request #3403 from asif-webkul/master
fixed issue #3381 and #3311
2020-07-03 11:41:02 +05:30
rahulshukla-home 8c779883aa Issue #3394 2020-07-03 11:13:42 +05:30
ghermans 105d6fd566 fixed #3381 2020-07-02 22:13:35 +02:00
Jitendra Singh 63d3c7b554
Merge pull request #3405 from jitendra-webkul/1.0
Added support for search with algolia and elasticsearch
2020-07-02 17:25:24 +05:30
jitendra e5f90b92d0 Added support for search with algolia and elasticsearch 2020-07-02 17:00:21 +05:30
rahulshukla-home 1cd7f76a3d Issue #3392 fixed 2020-07-02 14:57:31 +05:30
mohammad asif 00b9f4862c fixed issue 3311 filter disapear on zero product 2020-07-02 13:28:02 +05:30
mohammad asif 9dcfaf7d0a fixed issue 3381 city does not allowed hyphen 2020-07-02 13:23:49 +05:30
rahulshukla-home 171ea1114b Issue #3395 and #3396 fixed 2020-07-02 13:02:46 +05:30
rahulshukla-home 9416186c16 Issue #3395 and #3396 fixed 2020-07-02 12:57:22 +05:30
vaishali agarwal 8b8774d800 compare option default value for en locale 2020-07-01 10:13:20 +05:30
Jitendra Singh 4ea9ad0d39
Merge pull request #3384 from Haendlerbund/customizeable-order-number-generators
Customizeable order number generators
2020-06-30 22:52:07 +05:30
Florian Bosdorff b3bdcc473e change naming of order increment generator 2020-06-30 15:11:35 +02:00
jitendra b59f6e7264 Removed unique constraints from tax_categories table 2020-06-30 16:38:11 +05:30
jitendra 01a4e57d25 Issue #3354 fixed 2020-06-30 16:19:35 +05:30
jitendra 8bf852a7cf Added exception handler during social login redirect 2020-06-30 15:19:39 +05:30
Florian Bosdorff 81e71b413e fix BookingProductEventTicketFactory 2020-06-30 10:48:46 +02:00
Florian Bosdorff e480c6cda4 Merge branch 'bagisto/master' into customizeable-order-number-generators 2020-06-30 10:46:53 +02:00
jitendra c6d23bfdeb Issue #3373 fixed 2020-06-30 13:23:06 +05:30
Florian Bosdorff 98111f686c add ability to customize order incrment number generator 2020-06-30 09:46:48 +02:00
Jitendra Singh 1976f0e9f3
Merge pull request #3382 from shubhwebkul/master
Issue #3380 resolved
2020-06-30 12:56:09 +05:30
ghermans e04b30859f fixed #3371 2020-06-30 02:47:43 +02:00
Shubham Mehrotra 04921bfa4b #3380 2020-06-29 21:24:27 +05:30
Jitendra Singh c6cc431441
Merge pull request #3372 from overtrue/patch-1
Reuse variables
2020-06-29 17:00:18 +05:30