Commit Graph

5257 Commits

Author SHA1 Message Date
rahulshukla-home eefa67ff6b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-12 12:45:30 +05:30
rahulshukla-home 72a1866b8d Issue #3044 2020-05-12 12:44:34 +05:30
Jitendra Singh 8df7fbc23b
Merge pull request #3039 from rahulcs0082/development
Development
2020-05-11 16:36:00 +05:30
rahulshukla-home 1ddc2b42d7 Issue #3041 2020-05-11 14:51:06 +05:30
rahulshukla-home 9fb5d2f75e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-11 09:52:02 +05:30
rahulshukla-home 3af919ee5f Issue #3024 2020-05-11 09:51:37 +05:30
Jitendra Singh eb527f34e8
Merge pull request #3031 from jitendra-webkul/1.0
Added configuration for category page toolbar
2020-05-08 21:59:09 +05:30
Pranshu Tomar 527affe741 Resolved conflicts 2020-05-08 21:50:06 +05:30
Pranshu Tomar cdf637f833 Added configuration for category page toolbar 2020-05-08 21:47:47 +05:30
Jitendra Singh 6ac17965dc
Merge pull request #3028 from vivek-webkul/patch-43
[Updated: Address's contract, model and proxy classes.]
2020-05-08 13:44:15 +05:30
Vivek 433a2b68df [Updated: Address's contract, model and proxy classes.] 2020-05-08 12:18:43 +05:30
Jitendra Singh c0fb97bf80
Merge pull request #3019 from jitendra-webkul/1.0
Version details added in menu
2020-05-07 20:17:23 +05:30
Pranshu Tomar b0a811462f Version details added in menu 2020-05-07 20:12:06 +05:30
Jitendra Singh 071fc16e13
Merge pull request #3016 from shubhwebkul/master
checkout update
2020-05-07 15:21:00 +05:30
Jitendra Singh ad306f7c3f
Merge pull request #3017 from jitendra-webkul/1.0
Order comment email sent to customer
2020-05-07 14:24:57 +05:30
Pranshu Tomar 0893513b60 Order comment email sent to customer 2020-05-07 13:58:14 +05:30
Jitendra Singh 4b31626930
Merge pull request #2998 from MattApril/product_price_spacing_fix
Added missing space for configurable/grouped product price.
2020-05-07 12:34:25 +05:30
Shubham Mehrotra f446f1df19 process checkout if user not logged in 2020-05-07 12:31:45 +05:30
Jitendra Singh 45e61682cd
Merge pull request #3013 from jitendra-webkul/1.0
Order comment feature added
2020-05-06 22:52:09 +05:30
Jitendra Singh 91661dca32
Merge pull request #3006 from shubhwebkul/master
responsive product gallery issue resolved
2020-05-06 22:50:33 +05:30
Pranshu Tomar 2a9c3de89a Order comment feature added 2020-05-06 22:48:48 +05:30
Jitendra Singh adaeaf7087
Merge pull request #3010 from jitendra-webkul/1.0
Product multiple image select feature added
2020-05-06 17:08:29 +05:30
Pranshu Tomar 95caad1e7a Product multiple image select feature added 2020-05-06 17:02:44 +05:30
Jitendra Singh b42ccbfa9e
Merge pull request #3008 from rahulcs0082/development
Issue #2987
2020-05-06 12:03:29 +05:30
rahulshukla-home 83cb0ff3d8 Issue #2987 2020-05-06 11:39:45 +05:30
rahulshukla-home af3b152681 Issue #2987 2020-05-06 11:36:07 +05:30
Shubham Mehrotra d2842a5ce6 responsive product gallery issue resolved 2020-05-05 22:08:32 +05:30
Matt April e31db32515 Added missing space for configurable/grouped product price. 2020-05-04 18:01:50 -04:00
Jitendra Singh 7f3e564c14
Merge pull request #2966 from Haendlerbund/add_tests_for_cart_rules
Add tests for cart rules
2020-05-01 18:11:03 +05:30
Jitendra Singh 7639dfbf51
Merge pull request #2962 from Haendlerbund/channel-filter-for-cart-rule-grid
introduce channel and customer group filter for cart rule grid
2020-05-01 18:09:48 +05:30
Jitendra Singh e6ed484e19
Merge pull request #2978 from rahulcs0082/development
favicon for admin login
2020-05-01 16:06:53 +05:30
Jitendra Singh 0aaa1fd030
Merge pull request #2983 from Haendlerbund/fix-randomly-failing-tax-cest
Fix randomly failing TaxCest and CartTaxesCest
2020-05-01 16:05:48 +05:30
Jitendra Singh 24c076f47d
Merge pull request #2984 from Haendlerbund/fix-GuestCheckoutCest
fix GuestCheckoutCest.php
2020-05-01 16:05:11 +05:30
Steffen Mahler 95f190375e set price faker in Laravel5Helper to 2 decimals, fix rounding in CartTaxesCest too 2020-05-01 11:18:56 +02:00
Jitendra Singh b405ebf57f
Merge pull request #2977 from shubhwebkul/master
minor bug fix
2020-05-01 14:18:38 +05:30
Jitendra Singh f163abe1f8
Merge pull request #2965 from Haendlerbund/issue-2964/bugfix-api-exception-buying-nonstockable-item
resolve issue 2964
2020-05-01 14:00:53 +05:30
Steffen Mahler ad4e517291 remove newline 2020-05-01 10:13:38 +02:00
Steffen Mahler 1caa039fcd fix GuestCheckoutCest 2020-05-01 10:02:27 +02:00
Steffen Mahler 3d2e49ae7a remove unnecessary use statements 2020-05-01 09:29:56 +02:00
Steffen Mahler bf2c109a7b merge bagisto master 2020-05-01 09:14:33 +02:00
Steffen Mahler 68a1d16e92 fix randomly failing tax cest 2020-05-01 09:09:57 +02:00
rahulshukla-home 584b2ae9bd favicon for admin login 2020-04-30 18:31:41 +05:30
Shubham Mehrotra 9603befdec Merge branch 'master' of https://github.com/bagisto/bagisto 2020-04-30 17:21:46 +05:30
Shubham Mehrotra 235b0e6809 #2974 2020-04-30 17:21:41 +05:30
Jitendra Singh eb65eeedd0
Merge pull request #2970 from rahulcs0082/development
Issue #2969
2020-04-29 17:31:59 +05:30
rahulshukla-home 40db94bf25 Issue #2969 2020-04-29 17:21:07 +05:30
Jitendra Singh 751d8b88ed
Merge pull request #2968 from rahulcs0082/development
configuration added for favicon in admin
2020-04-29 16:38:35 +05:30
Jitendra Singh 89174f0c39
Merge pull request #2967 from rahulcs0082/development
Development
2020-04-29 16:36:02 +05:30
rahulshukla-home 2753c7b1d5 configuration added for favicon in admin 2020-04-29 16:35:04 +05:30
rahulshukla-home 2729dc99c2 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-04-29 15:13:26 +05:30