Commit Graph

3514 Commits

Author SHA1 Message Date
rahul shukla e927ebd821 product name issue 2020-02-24 12:31:18 +05:30
rahul shukla ab956a2a79 remove comment 2020-02-24 11:23:02 +05:30
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 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
rahul shukla 30cb18c1f5 Issue #2538 fixed and change log updated 2020-02-21 17:45:47 +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
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
ghermans fbfb493629 Fixed #2530 2020-02-20 20:22:17 +01:00
Annika Wolff 623b7893a2
resolve merge conflicts 2020-02-20 19:23:01 +01:00
Annika Wolff 154a933dc6
Merge branch 'master' into fix-tax-handling 2020-02-20 17:19:28 +01:00
Glenn Hermans 9e08585b85 #2512 - Added more dutch translations 2020-02-20 17:06:30 +01:00
Jitendra Singh f3c19efa26
Merge pull request #2528 from rahulshukla-webkul/development
Issue #2526
2020-02-20 19:54:32 +05:30
rahul shukla 9937f52de2 Issue #2526 2020-02-20 19:50:27 +05:30
Glenn Hermans 361ef64fa7 #2527 Added translations for order status 2020-02-20 15:12:05 +01:00
Glenn Hermans 1688342f18 #2527 Replaced static text in order datagrid 2020-02-20 15:11:37 +01:00
SteffenMahler 75f4d9925c
Fire event if customer wants to "buy now"
If a customer wants to buy a single product directly, the CartController add() method fires an event. The same event has to be fired via api request. In this case it's store() method.
2020-02-20 13:58:10 +01:00
ghermans 79a78cc9c9 #2512 - Added more dutch translations 2020-02-20 13:27:01 +01:00
Herbert Maschke f7219767ed fix CartRuleRepository once more 2020-02-20 13:26:14 +01:00
Glenn Hermans 416a7b849a 2512 - Added more dutch translations 2020-02-20 12:37:00 +01:00
Glenn Hermans d71d39208d 2512 - Removed static text and wrong translations 2020-02-20 12:36:13 +01:00
Jitendra Singh d8bd2cb31e
Merge pull request #2520 from shubhwebkul/bug-fixes
quick view short description issue
2020-02-20 16:44:03 +05:30
rahul shukla 66ba69586d filter issue in category 2020-02-20 16:31:46 +05:30
shubhammehrotra.symfony@webkul.com ac3a093687 quick view short description issue 2020-02-20 16:12:23 +05:30
Herbert Maschke 75d22eaf3a improve validation style of starts_from and ends_till in CartRuleRepository 2020-02-20 11:26:12 +01:00
shubhammehrotra.symfony@webkul.com b56dc467f9 compare minor updates 2020-02-20 15:38:19 +05:30
ghermans f45f83ab89 #2512 - Added more dutch translations 2020-02-20 09:59:27 +01:00
Jitendra Singh 521fc4b6b6 Improved booking product package code style 2020-02-20 13:43:06 +05:30
rahul shukla 6714b1d7c8 Issue #2468 2020-02-20 13:13:02 +05:30
Jitendra Singh 96cba32d8b Improved velocity package code style 2020-02-20 13:08:52 +05:30
shubhammehrotra.symfony@webkul.com 0ca4eb66f1 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-20 12:59:00 +05:30
shubhammehrotra.symfony@webkul.com 179cac23ce guest customer compare item 2020-02-20 12:58:49 +05:30
Jitendra Singh 62c3d48b4b Improved user package code style 2020-02-20 12:44:00 +05:30
Jitendra Singh 1ef5376a53 Improved ui package code style 2020-02-20 12:41:17 +05:30
Jitendra Singh 062bd52174 Improved theme package code style 2020-02-20 12:39:39 +05:30
Jitendra Singh 0740527b54 Improved tax package code style 2020-02-20 12:37:53 +05:30
Jitendra Singh 5f6e3be796 Improved shop package code style 2020-02-20 12:35:51 +05:30
rahul shukla 38f1251568 Issue #2468 2020-02-20 12:30:00 +05:30
Jitendra Singh a4d565e46e Improved shipping package code style 2020-02-20 12:24:38 +05:30
Jitendra Singh 7b8cf802f4 Improved sales package code style 2020-02-20 12:17:44 +05:30
Jitendra Singh aa1d6d145c Improved product package code style 2020-02-20 11:42:17 +05:30
rahul shukla e82fb888ab merge with master 2020-02-20 11:00:34 +05:30
rahul shukla 8835ab75dd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-02-20 10:59:29 +05:30
rahul shukla e5a0bc8a0e Issue #2500 and chaneelog updated 2020-02-20 10:56:59 +05:30
shubhammehrotra.symfony@webkul.com ec12a677f6 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-20 10:56:25 +05:30
shubhammehrotra.symfony@webkul.com 9480b95d00 compare items updates 2020-02-20 10:56:11 +05:30
ghermans cb99ea652b #2512 - Started dutch translations 2020-02-20 04:08:19 +01:00
rahul shukla d999bc18d9 Issue #2500 fixed 2020-02-19 21:16:20 +05:30
rahul shukla b5727a1152 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-02-19 21:13:37 +05:30
rahul shukla 229117c7b9 change log updated and Isssue #2500 fixed 2020-02-19 21:10:27 +05:30
Jitendra Singh c81c46f9d6 Improved payment package code style 2020-02-19 19:31:17 +05:30
Jitendra Singh ad4ab855e0 Improved inventory package code style 2020-02-19 19:22:29 +05:30
Jitendra Singh ec52229567 Improved customer package code style 2020-02-19 19:20:57 +05:30
Jitendra Singh 107e4338e3 Improved customer package code style 2020-02-19 19:20:15 +05:30
Jitendra Singh 9e7e939479 Improved customer package code style 2020-02-19 19:18:54 +05:30
shubhammehrotra.symfony@webkul.com e16fad3ac8 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-19 18:59:52 +05:30
shubhammehrotra.symfony@webkul.com a11c8e67b0 compare product updates 2020-02-19 18:59:38 +05:30
Jitendra Singh 07b3e3d76a
Merge pull request #2507 from prateek-webkul/master
issue #2470 fixed
2020-02-19 18:47:16 +05:30
Jitendra Singh bc04b34074
Merge pull request #2509 from vivek-webkul/patch-38
[Updated: resolved admin user delete issue.]
2020-02-19 18:46:51 +05:30
Jitendra Singh 5fb33d4fc9 Improved core package code style 2020-02-19 17:56:12 +05:30
Jitendra Singh 687df3dbdd Improved cms package code style 2020-02-19 17:45:43 +05:30
Jitendra Singh 973d8ebc60 Improved checkout package code style 2020-02-19 17:44:07 +05:30
Jitendra Singh 98b373d0cb Improved category package code style 2020-02-19 17:34:50 +05:30
Jitendra Singh 46b4b533c3 Improved catalog rule package code style 2020-02-19 17:32:35 +05:30
Jitendra Singh a31fba56b1 Resolved conflicts 2020-02-19 17:23:18 +05:30
Jitendra Singh 9c78f3b4db Improved cart rule package code style 2020-02-19 17:19:52 +05:30
Vivek Sharma 5f7b210a61 [Updated: same login user delete issue fixed.] 2020-02-19 17:11:56 +05:30
Jitendra Singh a72401dbba Improved attribute package code style 2020-02-19 17:09:17 +05:30
Jitendra Singh c5cc8fa541 Improved api package code style 2020-02-19 16:54:04 +05:30
prateek srivastava e1cdff607b Merge branch 'master' of https://github.com/bagisto/bagisto 2020-02-19 16:26:06 +05:30
prateek srivastava 36f795f09a assets for production 2020-02-19 16:25:40 +05:30
Vivek Sharma 20b7d78359 [Updated: resolved admin user delete issue.] 2020-02-19 16:22:19 +05:30
rahul shukla 86e31346d0 remove console 2020-02-19 16:17:31 +05:30
rahul shukla d62b61b19c Issue #2463 2020-02-19 16:12:54 +05:30
Jitendra Singh 99d506db94 Improved admin package code standard 2020-02-19 15:56:44 +05:30
Jitendra Singh b4c68c7f0b Improved datagrid code 2020-02-19 15:44:27 +05:30
prateek srivastava 6052b6355d Merge branch 'master' of https://github.com/bagisto/bagisto 2020-02-19 15:42:35 +05:30
prateek srivastava 74251ef2d2 issue 2470 fixed 2020-02-19 15:42:00 +05:30
rahul shukla 33f882209a code improvement 2020-02-19 15:32:52 +05:30
rahul shukla b6cdcad01d change depandeciy of slider component, hide attribute with option 2020-02-19 15:03:57 +05:30
rahul shukla bfd55c345f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-02-19 11:53:34 +05:30
rahul shukla 6133f84690 Product quantitity in datagrid 2020-02-19 11:53:14 +05:30
Jitendra Singh 4948c6f059
Merge pull request #2501 from ghermans/euro
Added euro currency
2020-02-19 10:49:38 +05:30
Jitendra Singh a48be0f32a
Merge pull request #2499 from prateek-webkul/master
issue #2479 fixed
2020-02-19 10:48:29 +05:30
Glenn Hermans c034c23d10
Added euro currency symbol 2020-02-19 00:53:49 +01:00
Glenn Hermans e13d767506
Added euro currency 2020-02-19 00:28:25 +01:00
prateek srivastava 9fe52991ac issue #2479 fixed 2020-02-18 20:18:01 +05:30
Jitendra Singh 6183dba5f2 Fixed comment indentation 2020-02-18 19:53:10 +05:30
Jitendra Singh 415eac6766 Booking migration added 2020-02-18 19:31:04 +05:30
Jitendra Singh 4801c2f371
Merge pull request #2497 from SteffenMahler/patch-1
Update CartController.php
2020-02-18 18:49:54 +05:30
Jitendra Singh 29aaeb494d
Merge pull request #2492 from shubhwebkul/velocity-updated
misc. updates
2020-02-18 18:45:39 +05:30
SteffenMahler b58ba0955e
Update CartController.php
It would be very useful to have an event dispatched, if the "Buy Now" button of a product was clicked.
2020-02-18 14:08:02 +01:00
rahul shukla 008964ba49 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-02-18 18:34:43 +05:30
rahul shukla bd82e011c0 Issue #2490 2020-02-18 18:34:32 +05:30
rahulshukla-webkul 5bfe263e10
Revert "add improvements to locale determination on product creation" 2020-02-18 18:14:22 +05:30
shubhammehrotra.symfony@webkul.com ea4f1a15d8 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-18 17:34:38 +05:30
shubhammehrotra.symfony@webkul.com 60a03e3b28 misc. updates 2020-02-18 17:34:19 +05:30
Jitendra Singh 11e4004954
Merge pull request #2487 from vivek-webkul/patch-37
[Fixed: Currency event related code fixed. ]
2020-02-18 15:56:42 +05:30
Vivek Sharma c1d7ab810d [Fixed: Currency event related code fixed. ] 2020-02-18 15:49:19 +05:30
Jitendra Singh b44db6a91e
Merge pull request #2484 from rahulshukla-webkul/development
helper updated
2020-02-18 15:37:08 +05:30
Jitendra Singh 87c2fc35dd
Merge pull request #2481 from prateek-webkul/master
issue #2479 fixed
2020-02-18 15:28:20 +05:30
rahul shukla 486520d3ac helper updated 2020-02-18 15:17:07 +05:30
Jitendra Singh 493a2c87e1
Merge pull request #2466 from FelipeAzambuja/patch-1
Update helpers.php
2020-02-18 15:10:54 +05:30
Jitendra Singh 7d161e31ef
Merge pull request #2373 from Haendlerbund/locale-improvements
add improvements to locale determination on product creation
2020-02-18 15:10:14 +05:30
prateek srivastava 4f7cfab704 issue #2480 fixed 2020-02-18 13:56:09 +05:30
prateek srivastava 2203c3ff05 issue #2479 fixed 2020-02-18 13:39:50 +05:30
shubhammehrotra.symfony@webkul.com f2d582a57b Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-18 11:52:42 +05:30
shubhammehrotra.symfony@webkul.com 22b80d0904 carousel in quick view 2020-02-18 11:52:37 +05:30
Jitendra Singh 0fee8123ba
Merge pull request #2475 from Haendlerbund/feature/allow-to-configure-outgoing-emails
Feature/allow to configure outgoing emails
2020-02-18 11:05:49 +05:30
shubhammehrotra.symfony@webkul.com 557286822d Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-18 10:58:36 +05:30
shubhammehrotra.symfony@webkul.com 9ee02d5f96 quick view & misc. bug fixes 2020-02-18 10:57:39 +05:30
Herbert Maschke 8909c74ad8 Merge branch 'bagisto/master' into feature/allow-to-configure-outgoing-emails 2020-02-17 16:54:26 +01:00
Herbert Maschke b0e37edd63 only send emails when configured so 2020-02-17 16:52:58 +01:00
Herbert Maschke cdc292c196 enable all notifications by default 2020-02-17 16:44:13 +01:00
Herbert Maschke 5cbbf7c4f6 add english i18n strings for email notification setup 2020-02-17 16:35:31 +01:00
Herbert Maschke a889b1f31f add mail notification defaults (everything true) to Config/system.php 2020-02-17 16:25:14 +01:00
Herbert Maschke 5129507456 add mail notification defaults (everything true) to ConfigTableSeeder.php 2020-02-17 16:04:59 +01:00
rahul shukla 8d2662b996 Issue #2467 2020-02-17 19:36:31 +05:30
Jitendra Singh ead65981dc Add to cart completed for booking product 2020-02-17 19:25:20 +05:30
rahul shukla 3c94cdf100 Issue #2463 2020-02-17 17:59:15 +05:30
Felipe Nunes Azambuja db3ff18531
Update helpers.php
tnks
2020-02-14 11:25:02 -03:00
shubhammehrotra.symfony@webkul.com e90193d476 misc. bug fixes 2020-02-14 16:48:57 +05:30
Jitendra Singh fa53b72058 Booking product type added 2020-02-14 11:40:12 +05:30
shubhammehrotra.symfony@webkul.com fccfbededb Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-13 20:37:52 +05:30
shubhammehrotra.symfony@webkul.com 1eb2aaf447 payment method update issue fixed 2020-02-13 20:37:21 +05:30
shubhammehrotra.symfony@webkul.com 7109998c3c updates 2020-02-13 20:23:36 +05:30
Jitendra Singh 5b032c2f5e
Merge pull request #2460 from shubhwebkul/velocity-updated
WIP: misc. updates
2020-02-13 19:01:55 +05:30
shubhammehrotra.symfony@webkul.com 78c3b98869 misc. updates 2020-02-13 18:56:26 +05:30
shubhammehrotra.symfony@webkul.com 986eb1f929 misc. updates 2020-02-13 18:37:58 +05:30
Jitendra Singh 3fb2b8a5c9
Merge pull request #2444 from Haendlerbund/add-data-to-factories
Added fields to order related factories
2020-02-13 17:11:17 +05:30
Jitendra Singh 5a6549f7ab
Merge pull request #2456 from shubhwebkul/velocity-updated
checkout misc. bug fixes
2020-02-13 15:57:34 +05:30
shubhammehrotra.symfony@webkul.com c85813de37 checkout updates 2020-02-13 15:29:33 +05:30
Jitendra Singh b3316a368c
Merge pull request #2455 from rahulshukla-webkul/development
Issue #2449
2020-02-13 14:55:27 +05:30
rahul shukla 9d80f73319 Issue #2449 2020-02-13 14:41:40 +05:30
Vivek Sharma 0219862de0 [Fixed: issue #2440 resolved.] 2020-02-13 14:00:59 +05:30
shubhammehrotra.symfony@webkul.com dc1888fceb assets 2020-02-12 19:18:23 +05:30
shubhammehrotra.symfony@webkul.com 98cdcfed10 merged conflicts 2020-02-12 19:17:20 +05:30
shubhammehrotra.symfony@webkul.com 25e3da0fa7 misc. bug fixes 2020-02-12 19:15:34 +05:30
rahul shukla f738cf4240 Issue #2439 2020-02-12 17:52:54 +05:30
Vivek Sharma c9e6baff5d [Fixed: issue #2440 has been resolved.] 2020-02-12 17:11:21 +05:30
Vivek Sharma b6ab1b0f99 [Fixed: layout issue #2381 resolved.] 2020-02-12 16:46:06 +05:30
Vivek Sharma 7098e651d3 [Fixed: layout issue #2381 resolved.] 2020-02-12 16:42:40 +05:30
Vivek Sharma 8db782bacf [Fixed: issue #2436 has been resolved.] 2020-02-12 15:13:07 +05:30
MonaHartdegen 2849ddd7db added fields to order related factories 2020-02-12 09:58:50 +01:00
Jitendra Singh ba8f44bea8
Merge pull request #2443 from jitendra-webkul/1.0
Converted configuration boolean type to switch
2020-02-12 13:46:25 +05:30
Jitendra Singh 881027ca4e Converted configuration boolean type to switch 2020-02-12 13:45:26 +05:30
Jitendra Singh 8550c0424f
Merge pull request #2442 from shubhwebkul/velocity-updated
checkout page updates
2020-02-12 13:20:42 +05:30
shubhammehrotra.symfony@webkul.com 3d3fa3408c checkout page updates 2020-02-12 13:18:24 +05:30
Jitendra Singh a6790b97d1 Issue #2438 fixed 2020-02-12 13:07:17 +05:30
Jitendra Singh 6243ad8c31
Merge pull request #2433 from jitendra-webkul/1.0
Issue #2250 fixed
2020-02-11 20:10:49 +05:30
Jitendra Singh 9c60312c21 Issue #2250 fixed 2020-02-11 20:06:38 +05:30
Jitendra Singh c78b76f3aa
Merge pull request #2432 from jitendra-webkul/1.0
Fixed intentation in CoreConfigRepository
2020-02-11 19:18:15 +05:30
Jitendra Singh ae8c9311cb
Merge pull request #2431 from vivek-webkul/patch-32
[Fixed: layout issue regarding #2399 resolved.]
2020-02-11 19:13:55 +05:30
Jitendra Singh fab5cc7a4f Fixed intentation in CoreConfigRepository 2020-02-11 19:13:39 +05:30
Vivek Sharma 31b7db34cb [Fixed: layout issue regarding #2399 resolved.] 2020-02-11 18:59:35 +05:30
Vivek Sharma bef1068d70 Fixed: button alignment corrected. 2020-02-11 18:40:58 +05:30
Jitendra Singh 13a5b3a116
Merge pull request #2429 from shubhwebkul/velocity-updated
minor bug fixes
2020-02-11 18:33:57 +05:30
shubhammehrotra.symfony@webkul.com 4323637bf9 minor bugs 2020-02-11 18:15:06 +05:30
Jitendra Singh c042ef5d90
Merge pull request #2428 from jitendra-webkul/1.0
Converted checkbox into switch
2020-02-11 18:00:41 +05:30
Jitendra Singh 300feaec0f Converted checkbox into switch 2020-02-11 17:56:25 +05:30
shubhammehrotra.symfony@webkul.com afa4ea627c Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-11 17:50:03 +05:30
shubhammehrotra.symfony@webkul.com d331c36bd8 misc. bug fixes 2020-02-11 17:49:48 +05:30
Jitendra Singh fe911cc2dc Issue #2398 fixed 2020-02-11 17:16:10 +05:30
Jitendra Singh 0caa8010d2 Issue #2424 fixed 2020-02-11 16:37:10 +05:30
Jitendra Singh df88b605be Issue #2416 fixed 2020-02-11 15:18:33 +05:30
Jitendra Singh 37d99c526f Issue #2417 fixed 2020-02-11 15:08:41 +05:30
Jitendra Singh 002a977e22 Issue #2417 fixed 2020-02-11 15:02:04 +05:30
Jitendra Singh 66f29937e9
Merge pull request #2405 from vivek-webkul/patch-23
[Fixed: issue #2322 has been resolved.]
2020-02-11 13:54:12 +05:30
Jitendra Singh b2b90d566a
Merge pull request #2380 from shaiv-webkul/master
#2364 issue fixed
2020-02-11 13:43:55 +05:30
Vivek Sharma 52ac7f8aaa [resolved conflict.] 2020-02-11 13:42:04 +05:30
Vivek Sharma b3b830e094 [Saved.] 2020-02-11 13:40:12 +05:30
Vivek Sharma 1fa7f93c2d [Saved.] 2020-02-11 13:38:03 +05:30
Vivek Sharma 424a0a1595 [Saved.] 2020-02-11 13:36:38 +05:30
shubhammehrotra.symfony@webkul.com 081a90d3d0 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-11 13:34:48 +05:30
shubhammehrotra.symfony@webkul.com 77e63a51b5 publishable assets issue resolved 2020-02-11 13:34:31 +05:30
Vivek Sharma 4c574a26ff [Fixed: changes card blade file.] 2020-02-11 13:30:54 +05:30
Vivek Sharma 213a622fec [Saved] 2020-02-11 13:29:22 +05:30
Vivek Sharma 817d46bb89 [Fixed: conflict resolved.] 2020-02-11 13:23:21 +05:30
Jitendra Singh 5ec6559a07 Issue #2395 fixed 2020-02-11 13:10:14 +05:30
Jitendra Singh 3f3962681b
Merge pull request #2385 from vivek-webkul/patch-17
[Fixed: issue #2378 has been resolved.]
2020-02-11 12:35:17 +05:30
Vivek Sharma 7ad61082c3 [Fixed: changes added.] 2020-02-11 12:31:18 +05:30