Commit Graph

5229 Commits

Author SHA1 Message Date
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
rahulshukla-home fee6645138 Issue #2942 2020-04-29 14:35:49 +05:30
rahulshukla-home 65f894689b Issue #2942 2020-04-29 14:32:56 +05:30
Steffen Mahler da90ed31b5 refactoring, variable renamed 2020-04-29 10:49:36 +02:00
Steffen Mahler 214d7a8161 merge branch 'add_tests_for_cart_rules' of https://github.com/Haendlerbund/bagisto into add_tests_for_cart_rules 2020-04-29 10:42:31 +02:00
Steffen Mahler 5d43e2b8bb type hint changed 2020-04-29 10:40:41 +02:00
Jitendra Singh 4899f90f1d
Merge pull request #2963 from rahulcs0082/development
Issue #2949 and #2950
2020-04-29 14:02:54 +05:30
SteffenMahler ede46da84b
Merge branch 'master' into add_tests_for_cart_rules 2020-04-29 10:31:06 +02:00
rahulshukla-home 6118cabbde localization error message added in velocity theme 2020-04-29 13:55:04 +05:30
Annika Wolff 5e1c0ac5d2 resolve issue 2964 2020-04-29 10:03:37 +02:00
rahulshukla-home dd5a41fedc Issue #2949 and #2950 2020-04-29 12:58:02 +05:30
Steffen Mahler cbd873b106 fix calulation helper in test 2020-04-29 09:27:19 +02:00
Herbert Maschke 3154d27f52 introduce channel and customer group filter for cart rule grid 2020-04-29 09:19:47 +02:00
Steffen Mahler d973ec94c0 add CartRuleCest 2020-04-28 18:15:40 +02:00
Jitendra Singh c88ca31b94
Merge pull request #2961 from jitendra-webkul/1.0
Version updated in env files
2020-04-28 21:25:25 +05:30
Jitendra Singh 20e6378816
Merge pull request #2930 from bagisto/dependabot/composer/symfony/http-foundation-4.4.7
Bump symfony/http-foundation from 4.4.5 to 4.4.7
2020-04-28 21:24:28 +05:30
Pranshu Tomar 3eff7c27de Version updated in env files 2020-04-28 21:23:55 +05:30
Jitendra Singh 454d95dd47
Merge pull request #2960 from jitendra-webkul/1.0
Updated change log file
2020-04-28 21:21:37 +05:30
Pranshu Tomar f13ce737b4 Updated change log file 2020-04-28 21:20:46 +05:30
Jitendra Singh be3fe03e27
Merge pull request #2959 from jitendra-webkul/1.0
Issue #2945 fixed
2020-04-28 20:48:08 +05:30
Pranshu Tomar 209de7f7e5 Updated change log file 2020-04-28 20:47:45 +05:30
Pranshu Tomar b5ebfe79ea Issue #2945 fixed 2020-04-28 20:34:14 +05:30
Jitendra Singh a8c969d019
Merge pull request #2958 from jitendra-webkul/1.0
Issue #2954 fixed
2020-04-28 20:03:36 +05:30
Pranshu Tomar 1a716047ac Issue #2954 fixed 2020-04-28 19:57:30 +05:30
Pranshu Tomar 16fcb02502 Removed unnecessary code from CartController 2020-04-28 19:32:50 +05:30
Jitendra Singh 790719f1b1
Merge pull request #2956 from namvarii/master
fix translation in add attribute button
2020-04-28 19:30:21 +05:30
Jitendra Singh acafb441c3
Merge pull request #2957 from jitendra-webkul/1.0
Updated change log
2020-04-28 19:27:27 +05:30
Pranshu Tomar 559954e88d Issue #2954 fixed 2020-04-28 19:22:30 +05:30
namvarii cd8e994efa
fix translation in add attribute button
fix add button not translated to other language.
2020-04-28 18:09:21 +04:30