Commit Graph

3514 Commits

Author SHA1 Message Date
shubhammehrotra.symfony@webkul.com ee4f81004c #2639 2020-03-16 13:34:01 +05:30
Jitendra Singh 96ab5e390e
Merge pull request #2662 from jitendra-webkul/1.0
Issue #2660 fixed
2020-03-16 11:57:51 +05:30
Jitendra Singh 282545e1c4 Issue #2660 fixed 2020-03-16 11:53:39 +05:30
Vivek 1572075443 [Updated: worked on conflict.] 2020-03-16 11:10:07 +05:30
Jitendra Singh 355a6a5c5d
Merge pull request #2659 from jitendra-webkul/1.0
Issue #2658 fixed
2020-03-16 11:03:00 +05:30
Jitendra Singh 7182400059 Issue #2658 fixed 2020-03-16 11:02:14 +05:30
Jitendra Singh 7072a60cda
Merge pull request #2657 from jitendra-webkul/1.0
Issue #2654 fixed
2020-03-13 19:16:48 +05:30
Jitendra Singh 7413e1577e Issue #2654 fixed 2020-03-13 19:15:59 +05:30
Jitendra Singh 65b34add4b
Merge pull request #2656 from jitendra-webkul/1.0
Catalog price rule issue fixed if discounted and normal price is same
2020-03-13 19:08:08 +05:30
Jitendra Singh e38a95cb3f Catalog price rule issue fixed if discounted and normal price is same 2020-03-13 19:07:14 +05:30
Jitendra Singh cae24088da
Merge pull request #2655 from jitendra-webkul/1.0
Catalog price rule issue fixed if discounted and normal price is same
2020-03-13 19:04:20 +05:30
Jitendra Singh 4e10d706f5 Catalog price rule issue fixed if discounted and normal price is same 2020-03-13 19:03:19 +05:30
Jitendra Singh 195344e8a2
Merge pull request #2653 from jitendra-webkul/1.0
Issue #2638 fixed
2020-03-13 18:31:15 +05:30
Jitendra Singh 9b60f0b8ec Issue #2638 fixed 2020-03-13 17:51:46 +05:30
Jitendra Singh 46ab49c489
Merge pull request #2652 from jitendra-webkul/1.0
Issue #2649 fixed
2020-03-13 17:43:57 +05:30
Jitendra Singh fd15942132 Issue #2649 fixed 2020-03-13 17:37:25 +05:30
Jitendra Singh c0f174e86b
Merge pull request #2651 from jitendra-webkul/1.0
Issue #2650 fixed
2020-03-13 17:21:36 +05:30
Jitendra Singh ef7dac9fec Issue #2650 fixed 2020-03-13 17:04:00 +05:30
Jitendra Singh 3a9fbbaff3
Merge pull request #2648 from jitendra-webkul/1.0
Issue #2643 fixed
2020-03-13 16:47:43 +05:30
Jitendra Singh fbf4ffa1c3 Issue #2643 fixed 2020-03-13 16:42:04 +05:30
Jitendra Singh c2633d06c0
Merge pull request #2647 from jitendra-webkul/1.0
Issues #2634, #2635 fixed
2020-03-13 12:56:41 +05:30
Jitendra Singh 557e619bdc Issues #2634, #2635 fixed 2020-03-13 12:52:26 +05:30
Jitendra Singh 30f94375f3
Merge pull request #2631 from Haendlerbund/show-multiple-flash-messages-in-admin-panel
bugfix: show multiple flash messages in admin panel
2020-03-12 14:53:46 +05:30
Jitendra Singh 00f8f7ddb0 Issue #2630 fixed 2020-03-11 16:45:06 +05:30
Jitendra Singh ec3be668b6 Issue #2630 fixed 2020-03-11 15:36:45 +05:30
Annika Wolff 04c35bb88d uncommented factory loading in TaxServiceProvider, bc. tests will miss it 2020-03-11 11:06:17 +01:00
Annika Wolff 65b5ec9232 bugfix: show multiple flash messages in admin panel 2020-03-11 10:45:18 +01:00
Jitendra Singh 6063c113bf Removed static text from shop datagrid 2020-03-11 12:15:03 +05:30
Vivek Sharma ffd918af20 [Updated: Changed Velocity's models related code.] 2020-03-07 11:43:22 +05:30
Jitendra Singh 5859d8dfc2
Merge pull request #2625 from jitendra-webkul/booking-product
Remove static text from grid
2020-03-06 20:06:21 +05:30
Jitendra Singh 101df848d6 Remove static text from grid 2020-03-06 20:03:32 +05:30
Jitendra Singh 8ca9bd864c Remove static text from grid 2020-03-06 19:49:47 +05:30
Jitendra Singh 741c1f25ee
Merge pull request #2624 from jitendra-webkul/booking-product
Up down icon issue fixed
2020-03-06 19:10:54 +05:30
Jitendra Singh 27aa309754 Up down icon issue fixed 2020-03-06 19:04:58 +05:30
Jitendra Singh 9846fb9408
Merge pull request #2623 from jitendra-webkul/booking-product
Booking product added and improved code style and code comments
2020-03-06 17:51:25 +05:30
Jitendra Singh 2f9724e03d attributeOptionRepository undefined variable issue fixed 2020-03-06 17:47:20 +05:30
Annika Wolff f4f5d2ea71 make invoice factory php7.3 compatible 2020-03-06 12:52:35 +01:00
Jitendra Singh fcf043ca6f Improved code style 2020-03-06 16:09:53 +05:30
Jitendra Singh 73ce8a4dd7 Resolved conflicts 2020-03-06 16:04:17 +05:30
Jitendra Singh 010ae65691 Resolved conflicts 2020-03-06 16:02:52 +05:30
Jitendra Singh 276a2e288b
Merge pull request #2612 from Haendlerbund/revert-2603-development
Revert "Development"
2020-03-06 15:16:08 +05:30
shubhammehrotra.symfony@webkul.com 5ad2b9109f use product flat instead of product entity 2020-03-06 14:41:33 +05:30
shubhammehrotra.symfony@webkul.com d212536170 image resolution & quick view price issue resolved 2020-03-06 13:24:31 +05:30
shubhammehrotra.symfony@webkul.com b564e63ad7 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-03-06 12:26:13 +05:30
shubhammehrotra.symfony@webkul.com 8d167c7b76 #2609, #2602 & misc. 2020-03-06 12:25:59 +05:30
Jitendra Singh 955da20b45 Improved comments in code 2020-03-05 19:49:14 +05:30
Jitendra Singh b503c50e0b Fixed bug 2020-03-05 19:40:47 +05:30
Jitendra Singh 3068ecd9ae Improved comments in code 2020-03-05 19:34:30 +05:30
Jitendra Singh 10db1838f2 Removed author information from every class 2020-03-05 19:28:42 +05:30
Jitendra Singh 42c16cbbfd Improved comments in code 2020-03-05 19:13:42 +05:30