merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,638 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

4172 Commits

Author SHA1 Message Date
İlyas Okay ad9c85a0f5 Turkish Language added and English language duplicate rows deleted. 2020-06-03 18:11:28 +03:00
Jitendra Singh d75059254b
Merge pull request #3134 from Haendlerbund/cart-rule-validator-extension 
Cart rule validator extension
 2020-06-03 19:39:04 +05:30
Jitendra Singh 1e81e4b97d
Merge pull request #3165 from shubhwebkul/master 
check if product_id exists
 2020-06-03 19:31:28 +05:30
Jitendra Singh 9294eb81b3
Merge pull request #3167 from Haendlerbund/extend-editor-functionality 
Extend CMS editor functionality
 2020-06-03 19:29:30 +05:30
İlyas Okay 77e0610c89 Turkish Language added and English language duplicate rows deleted. 2020-06-03 16:22:23 +03:00
Pranshu Tomar 0de17f4711 Issue #3164 fixed 2020-06-03 13:25:02 +05:30
phillipmohr 9fbd436892 add table, lists, link and hr functionality to editor 2020-06-03 09:44:19 +02:00
Herbert Maschke 6ee005dda0 make a prefix to the copied cart rule ('copy of XXX') and properly save related channels and customer groups after replication 2020-06-03 09:24:40 +02:00
Shubham Mehrotra c8e987f1e9 check if product_id exists 2020-06-03 12:14:24 +05:30
Annika Wolff 51851a077a fix compatibility issue to AbstractType 2020-06-03 07:37:26 +02:00
Annika Wolff 4104a7b2ba Merge bagisto/master into cart-rule-validator-extension 2020-06-03 07:36:43 +02:00
Annika Wolff b8a6619c81 Merge 'cart-rule-validator-extension' of bagisto into cart-rule-validator-extension 2020-06-03 07:16:39 +02:00
Annika Wolff ca6933d3a8 add english translation to foreign languages 2020-06-03 07:15:56 +02:00
Annika Wolff f99ecf6086
Refactor some changes 
Co-authored-by: Florian Bosdorff <26360670+bosix@users.noreply.github.com>
 2020-06-03 07:12:22 +02:00
Jitendra Singh bac17a08fb
Merge pull request #3163 from jitendra-webkul/1.0 
Fixed bundle type class compatablity issue
 2020-06-02 18:53:54 +05:30
Pranshu Tomar 8e64676197 Fixed bundle type class compatablity issue 2020-06-02 18:49:20 +05:30
Jitendra Singh 0b4b09b670
Merge pull request #3162 from bagisto/1.0 
Added customer group price
 2020-06-02 18:14:42 +05:30
Pranshu Tomar ae9ec7ce9b Added customer group price 2020-06-02 18:13:34 +05:30
Matt April 5c067d11de Fixed case sensitivity typo in Bundle class 2020-05-29 12:36:58 -04:00
Steffen Mahler 4714e6d89f add type hint 2020-05-29 13:46:20 +02:00
Steffen Mahler 80bd331123 add function to remove inactive products from cart 2020-05-29 13:28:54 +02:00
Annika Wolff 2748ba84ce add additional to all languages 2020-05-28 13:39:41 +02:00
Annika Wolff 566c65ef99 Merge 'master' into cart-rule-validator-extension 2020-05-28 13:36:13 +02:00
Annika Wolff 5f10981136 Merge 'master' of https://github.com/Haendlerbund/bagisto 2020-05-28 13:25:47 +02:00
Annika Wolff f53a6fba16 extend cart rule validation with search in cart item additional 2020-05-28 13:14:58 +02:00
Shubham Mehrotra e77618f469 Merge branch 'master' of https://github.com/bagisto/bagisto 2020-05-28 15:58:48 +05:30
Shubham Mehrotra 1dace6e5cf remove irrelevant code 2020-05-28 15:58:31 +05:30
Jitendra Singh 05a1e0eb13
Merge pull request #3125 from kmso-de/bugfix/menu-icons-mobile 
overlapping logo with menu icons (click action)
 2020-05-28 15:09:35 +05:30
rahulshukla-home e52cba981f Issue #3021 2020-05-27 22:09:17 +05:30
Jan Bickel b6048ea60a overlapping logo with menu icons (click action), built assets 2020-05-27 18:04:38 +02:00
rahulshukla-home b8417ff7d3 Issue #2804 2020-05-27 19:07:30 +05:30
rahulshukla-home 9963c87bd1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-27 18:37:06 +05:30
rahulshukla-home 2c002a0f8a Issue #2729 2020-05-27 18:36:52 +05:30
Jan Bickel 3fad14a569 overlapping logo with menu icons (click action) 2020-05-27 13:11:13 +02:00
Jitendra Singh b254736bd5
Merge pull request #3123 from shubhwebkul/master 
Issue #1522 resolved
 2020-05-27 16:23:20 +05:30
Jitendra Singh 23fd60cf2b
Merge pull request #3121 from Haendlerbund/copy-cart-rules 
introduce the ability to copy a cart rule
 2020-05-27 16:22:54 +05:30
Jitendra Singh 21eb34c64b
Merge pull request #3027 from Haendlerbund/bugfix-save-booking-products 
#3026 fixed
 2020-05-27 16:21:41 +05:30
Jitendra Singh 8e3be0c692 Merge pull request #3109 from Haendlerbund/add-field-company-name-to-views 
add field company_name to views
 2020-05-27 15:04:18 +05:30
Annika Wolff a22c2e02be introduce cronjob to automatically deactivate expired events 2020-05-27 11:31:35 +02:00
Shubham Mehrotra 9eb14326c4 #1522 2020-05-27 13:03:10 +05:30
Jitendra Singh c5cb04febf
Merge pull request #3112 from rahulcs0082/development 
Development
 2020-05-27 10:31:26 +05:30
Herbert Maschke b4a18bfaf3 introduce the ability to copy a cart rule 2020-05-26 13:39:54 +02:00
Herbert Maschke 11fb120b51 adjust cart rule filter position a few pixels to align it as it is in products/index.blade.php 2020-05-25 08:31:12 +02:00
Annika Wolff 8a51417425 revert changes 2020-05-22 12:12:40 +02:00
Annika Wolff 5363b5645f revert changes 2020-05-22 12:09:19 +02:00
Steffen Mahler 5a7ec123c7 fix typo 2020-05-22 12:02:33 +02:00
Annika Wolff f42974f9e8 revert changes, add flag to config 2020-05-22 11:50:17 +02:00
Steffen Mahler 764df61509 trigger pipeline again 2020-05-22 09:57:34 +02:00
rahulshukla-home a500fa9074 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-22 13:13:10 +05:30
rahulshukla-home 01884e09c0 Issue #3089 fixed 2020-05-22 13:12:36 +05:30
Steffen Mahler d664c92d30 trigger pipeline 2020-05-22 08:52:03 +02:00
Steffen Mahler f04abcbc85 add field company_name to views 2020-05-22 08:31:11 +02:00
Jitendra Singh 8074168daa
Merge pull request #3105 from Haendlerbund/show-company-name-in-order-details-view 
add field company_name to bliss views
 2020-05-21 11:57:44 +05:30
Jitendra Singh e0940edbb4
Merge pull request #3104 from shubhwebkul/patch-2 
Issue #3041 resolved
 2020-05-21 11:56:52 +05:30
Jitendra Singh 718a38ff02
Merge pull request #3103 from shubhwebkul/patch-1 
Issue #2997 resolved
 2020-05-21 11:56:33 +05:30
Jitendra Singh cce9167669
Merge pull request #3102 from rahulcs0082/development 
Issue #3067 fixed
 2020-05-21 11:56:12 +05:30
Steffen Mahler d0d6f2b046 add field company_name to bliss views 2020-05-20 17:44:03 +02:00
Shubham Mehrotra 0607b15b3f #3041 2020-05-20 19:52:00 +05:30
Shubham Mehrotra 40bbad93b3 remove irrelevant code 2020-05-20 18:27:07 +05:30
Shubham Mehrotra 47ae40d6b1 #2997 2020-05-20 18:24:33 +05:30
rahulshukla-home 4cf8b7cddb Issue #3089 2020-05-20 17:15:10 +05:30
rahulshukla-home 17ae225444 Issue #3067 fixed 2020-05-20 16:19:25 +05:30
Jitendra Singh 4842eb4de6
Merge pull request #3101 from shubhwebkul/patch-2 
Issue #3096 resolved
 2020-05-20 14:53:46 +05:30
Shubham Mehrotra 7aa860d173 #3096 2020-05-20 13:32:34 +05:30
Shubham Mehrotra 646e4b6241 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1 2020-05-20 12:47:44 +05:30
Shubham Mehrotra 2fdd75ab92 #3097 2020-05-20 12:47:26 +05:30
Jitendra Singh 02faf5e610
Merge pull request #3098 from rahulcs0082/development 
Issue #3095  fixed.
 2020-05-20 12:25:09 +05:30
Pranshu Tomar b335321c45 Resolve conflicts 2020-05-20 12:22:31 +05:30
Pranshu Tomar 1dc4afc4ee Issue #3095 fixed 2020-05-20 12:21:16 +05:30
rahulshukla-home 15592aa8b1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-20 12:15:36 +05:30
rahulshukla-home 07db69b2f6 Issue #3095 2020-05-20 12:15:19 +05:30
Jitendra Singh 4ef9e3b683
Merge pull request #3094 from rahulcs0082/development 
Issue #3073
 2020-05-19 19:20:11 +05:30
rahulshukla-home f3dd1e4d99 Issue #3073 2020-05-19 18:46:43 +05:30
Shubham Mehrotra 74357b56a7 #3076 2020-05-19 13:56:07 +05:30
Jitendra Singh 27420b5de0
Merge pull request #3074 from MattApril/bundle_item_ordering 
Ordering bundle items in cart by sort_order rather than id
 2020-05-19 12:45:24 +05:30
Jitendra Singh b4e11a842b
Merge pull request #3092 from rahulcs0082/development 
Issue #3089
 2020-05-19 12:37:57 +05:30
Jitendra Singh b520af03c3
Merge pull request #3091 from jitendra-webkul/1.0 
SEO optimization added for velocity and og tag added
 2020-05-19 12:36:31 +05:30
rahulshukla-home 74a8b57801 Issue #3089 2020-05-19 12:25:40 +05:30
Pranshu Tomar c63d1d97f3 SEO optimization added for velocity and og tag added 2020-05-19 11:13:29 +05:30
Jitendra Singh 84aede5cef
Merge pull request #3088 from jitendra-webkul/1.0 
Rich snippet feature added for products and category
 2020-05-18 23:08:33 +05:30
Pranshu Tomar 94e4a165eb Added translations to other languages 2020-05-18 23:07:12 +05:30
Pranshu Tomar 072b56930b Rich snippet feature added for products and category 2020-05-18 23:04:09 +05:30
Jitendra Singh ff49583f81
Merge pull request #3078 from MattApril/product_sorting 
Products: Fix for missing or invalid sort direction
 2020-05-18 20:59:47 +05:30
Jitendra Singh 3e894fc3da
Merge pull request #2999 from MattApril/fix_broken_state_taxes 
Fixed undefined $state variable when using State based tax rates.
 2020-05-18 20:56:50 +05:30
Jitendra Singh 31571f94d5
Merge pull request #3084 from shubhwebkul/patch-2 
Issue #3053 resolved
 2020-05-18 20:50:48 +05:30
Jitendra Singh d42069d923
Merge pull request #3085 from shubhwebkul/patch-3 
Issue #2994 #2973 resolved
 2020-05-18 20:50:15 +05:30
Jitendra Singh 576c3af7ae
Merge pull request #3086 from rahulcs0082/development 
Issue #3079
 2020-05-18 20:49:33 +05:30
rahulshukla-home 5099687ebf Issue #3079 2020-05-18 18:47:00 +05:30
Shubham Mehrotra 2f481e4022 #2994 #2973 2020-05-18 17:11:52 +05:30
Shubham Mehrotra ccc24acdab #3053 2020-05-18 15:26:37 +05:30
Shubham Mehrotra 258009e050 remove previous changes 2020-05-18 15:25:03 +05:30
Shubham Mehrotra 77db0f6a48 remove extra changes 2020-05-18 14:46:19 +05:30
Shubham Mehrotra 7cf09f56ac remove extra changes 2020-05-18 14:44:13 +05:30
Shubham Mehrotra be644f6134 decoded uri in search 2020-05-18 14:35:16 +05:30
Shubham Mehrotra 1a91ef116f #3076 2020-05-18 12:59:23 +05:30
Matt April 1f5e7c0daa Fix for missing or invalid sort direction 2020-05-15 15:49:15 -04:00
Matt April 9013fd6b95 Ordering bundle items in cart by sort_order rather than id 2020-05-15 11:00:31 -04:00
Jitendra Singh 782c369e28
Merge pull request #3069 from jitendra-webkul/1.0 
Issue #2762 fixed
 2020-05-15 17:02:57 +05:30
Jitendra Singh 2deb7aaf77
Merge pull request #3071 from rahulcs0082/development 
change translation for #2794
 2020-05-15 17:02:37 +05:30
Jitendra Singh 2ea98d4089
Merge pull request #3064 from kmso-de/feature/german-translation 
Feature/german translation
 2020-05-15 17:02:08 +05:30
rahulshukla-home 64ca06dc1d change translation for #2794 2020-05-15 13:03:37 +05:30
Jan Bickel eb5de5acdf added localize to admin 2020-05-15 07:56:41 +02:00
Jan Bickel 755874e0ae removed Validator.localize('de', de) & Vue.use(VeeValidate) 2020-05-15 07:51:53 +02:00
Pranshu Tomar 61a585c5d1 Issue #2762 fixed 2020-05-14 18:06:34 +05:30
rahulshukla-home e4c1b65bd1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-13 22:28:17 +05:30
rahulshukla-home 426ea4d802 Issue #3050 2020-05-13 22:27:42 +05:30
Pranshu Tomar dabb4840f0 Issue #2764 fixed 2020-05-13 22:14:42 +05:30
Pranshu Tomar 1094307786 Issue #2764 fixed 2020-05-13 22:13:02 +05:30
Jan Bickel 8eea8db266 german translation 2020-05-13 17:08:20 +02:00
Jitendra Singh c26a759fbc Added polish language 2020-05-13 20:22:25 +05:30
Roman Berneburg 03f8b6dc18 translations 2020-05-13 16:51:15 +02:00
Roman Berneburg f179925e5d translations "to" 2020-05-13 16:51:09 +02:00
Jan Bickel 54b535f8f4 customer german translation 
# Conflicts:
#	packages/Webkul/Customer/src/Resources/lang/de/app.php
 2020-05-13 16:50:25 +02:00
Roman Berneburg 05c3012eda german translations for Customer, Admin, Shop 2020-05-13 16:49:49 +02:00
Jan Bickel b1c3f7f3d0 german translations shop and admin 2020-05-13 16:49:40 +02:00
Jan Bickel 64e5f19861 german translations 2020-05-13 16:49:17 +02:00
Jan Bickel eae82352f7 german translations 
# Conflicts:
#	packages/Webkul/Velocity/src/Resources/assets/js/app.js
 2020-05-13 16:49:14 +02:00
Roman Berneburg a1f4a29b28 translation 2020-05-13 16:46:50 +02:00
Roman Berneburg 74dfa77cd0 translation 2020-05-13 16:45:45 +02:00
Jan Bickel 23900807ea ui german translation 2020-05-13 16:45:33 +02:00
Jan Bickel 35948d7acb admin german translation 2020-05-13 16:45:18 +02:00
Jan Bickel a8f8ecc23f added: files for translation 2020-05-13 16:44:53 +02:00
rahulshukla-home 457d491ebd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-13 17:52:40 +05:30
rahulshukla-home dda2314152 Issue #3051 2020-05-13 17:51:47 +05:30
Jitendra Singh e5fef36e26
Merge pull request #3057 from jitendra-webkul/1.0 
Issue #3054 fixed
 2020-05-13 17:08:06 +05:30
Pranshu Tomar 020df01980 Issue #3054 fixed 2020-05-13 16:53:25 +05:30
Jitendra Singh f3a49b35de
Merge pull request #3033 from Haendlerbund/flexible-exception-handling 
Improve exception handler
 2020-05-13 12:53:44 +05:30
Jitendra Singh 4af22ad5df
Merge pull request #3034 from Haendlerbund/fix-namespace-issues 
fix namespace issues
 2020-05-13 12:53:21 +05:30
Jitendra Singh afa4d5068a
Merge pull request #3023 from MattApril/product_filtering_performance 
Rebuilt product filter query for improved performance.
 2020-05-13 12:53:12 +05:30
Jitendra Singh 5630e0ee5d
Merge pull request #3003 from Haendlerbund/fix-bugs-extend-test 
various fixes for cart rules and taxes
 2020-05-13 12:52:41 +05:30
Jitendra Singh 7a84d81880
Merge pull request #3046 from rahulcs0082/development 
Development
 2020-05-13 12:51:44 +05:30
Annika Wolff b5372337c5 undo formatting of time in validation after 2020-05-13 08:36:38 +02:00
Annika Wolff dddef80f73 remove validation function after_datetime 2020-05-13 08:34:33 +02:00
rahulshukla-home 39965792aa Issue #3020 and 3024 2020-05-13 11:18:05 +05:30
Steffen Mahler 15320934b4 fix issue with coupons with same code 2020-05-12 16:43:56 +02:00
rahulshukla-home 18e4af0356 Issue #3047 2020-05-12 14:23:41 +05:30
rahulshukla-home 72a1866b8d Issue #3044 2020-05-12 12:44:34 +05:30
ottopodo 909913870b Italian translation 
Correct bug
 2020-05-11 22:46:35 +02:00
ottopodo 9229e36175 Italian Translations 2020-05-11 19:19:28 +02:00
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
Florian Bosdorff 33ddae27ae fix namespace issues 2020-05-09 12:38:20 +02:00
Florian Bosdorff 48e0026ec2 fix typo 2020-05-09 12:29:34 +02:00
Florian Bosdorff 85ef3fe69b remove unused exception handler; make exception handler extendable 2020-05-09 12:21:54 +02:00
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
Vivek 433a2b68df [Updated: Address's contract, model and proxy classes.] 2020-05-08 12:18:43 +05:30
Matt April 17b3f6bb93 Rebuilt product filter query for improved performance. 2020-05-07 20:47:20 -04:00
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
Annika Wolff 41754f4f73
Bagisto to HB Update (#23) 
* Bump symfony/http-foundation from 4.4.5 to 4.4.7

Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation) from 4.4.5 to 4.4.7.
- [Release notes](https://github.com/symfony/http-foundation/releases)
- [Changelog](https://github.com/symfony/http-foundation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-foundation/compare/v4.4.5...v4.4.7)

Signed-off-by: dependabot[bot] <support@github.com>

* remove line

* #2808

* #2785

* checkout page margin added

* {git commit -m

* checkout page issue

* modal view update

* bundled assets

* remove irrelevant css

* #2775

* remove irrelevant xhr

* revert back changes in format price

* category call get products method

* customer options click issue resolved

* customer panel accordian view and file picker view

* customer accordian design update

* Issue #2812

* compare page update height after loading images

* api changes

* code changed for api

* #2329

* issue #2792 resolved

* margin added between wishlist icon and compare icon

* checkout page email validation

* #2834

* Issue #2713 fixed

* Issue #2851 fixed

* Issue #2847

* Issue #2851 fixed

* Issue #2768 fixed

* #2691

* Issue #2794

* #2849

* #2856

* Changelog updated

* subcategory visibility issue in responsive

* #2790

* Issue #2793

* Issue #2846 fixed

* Changelog updated

* Fixed date icon issue

* Translate mass-update for review status in admin grid

* Fix save-category btn translation for langs with noun case

* Added more view_render_events in the customer account views

* Added view_render_event to admin order view

* Created new view_render_events for admin order and invoice view

* #2866

* calculate height on change value of dropdown

* #2876

* Issue #2784 fixed

* Updated changelog

* Issue #2871 fixed

* Issue #2543 fixed

* subcategory issue resolved

* Updated changelog

* #2875

* Issue #2890

* 2875 update

* remove channel from tax category

* introduce channel and channel inventory source factories

* Issue #2895

* removed dd

* Issue #2893

* add unified address-table and handling for models

* Issue #2884

* Issue #2863 fixed

* fix address_type at many places; add tests for address relations

* Issue #2793

* Issue #2721

* fix address-constrains; fix address global scopes

* variant products images update issue resolved

* rename address types

* responsive cart count update

* #2915

* fix typo in address migration

* update

* update

* add option to OrderItemFactory to use existing product

* Added new events to customer update and checkou, fixed some view render events and pt_BR grammar

* Add Japanese translation

* Moved command to packages

* Updated composer lock file

* Bump symfony/http-foundation from 4.4.5 to 4.4.7

Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation) from 4.4.5 to 4.4.7.
- [Release notes](https://github.com/symfony/http-foundation/releases)
- [Changelog](https://github.com/symfony/http-foundation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-foundation/compare/v4.4.5...v4.4.7)

Signed-off-by: dependabot[bot] <support@github.com>

* #2908

* customer sidebar menu issue resolved

* removed layered navigation in searchproducts page

* #2919

* content header path update

* add check if view exists

* [Updated: getBaseImage() method updated for configurable product.]

* Cancel feature added in customer order

* Installer fixes

* resolved issue with product images carousel

* change file name from views to Views

* Auto exchange rate feature added

* fix category issue and change country,state order

* max price issue in category

* Updated change log file

* Updated change log file

* fix translation in add attribute button

fix add button not translated to other language.

* Issue #2954 fixed

* Removed unnecessary code from CartController

* Issue #2954 fixed

* Issue #2945 fixed

* Updated change log file

* Updated change log file

* Version updated in env files

* add CartRuleCest

* introduce channel and customer group filter for cart rule grid

* fix calulation helper in test

* Issue #2949 and #2950

* resolve issue 2964

* localization error message added in velocity theme

* type hint changed

* refactoring, variable renamed

* Issue #2942

* Issue #2942

* configuration added for favicon in admin

* Issue #2969

* #2974

* favicon for admin login

* fix randomly failing tax cest

* remove unnecessary use statements

* fix GuestCheckoutCest

* remove newline

* set price faker in Laravel5Helper to 2 decimals, fix rounding in CartTaxesCest too

* Added missing space for configurable/grouped product price.

* responsive product gallery issue resolved

* Issue #2987

* Issue #2987

* Product multiple image select feature added

* Order comment feature added

* process checkout if user not logged in

* Order comment email sent to customer

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Shubham Mehrotra <shubh0896m@gmail.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: rahulshukla-home <rahulcs0082@gmail.com>
Co-authored-by: Herbert Maschke <thyseus@gmail.com>
Co-authored-by: shivam kumar <shivam.kumar174@webkul.com>
Co-authored-by: Shivam kumar <50355852+shivam-webkul@users.noreply.github.com>
Co-authored-by: hexu <hexu.garfield@gmail.com>
Co-authored-by: Pranshu Tomar <pranshutomar@Pranshus-MacBook-Air.local>
Co-authored-by: VaD1ke <vl.slesarenko@gmail.com>
Co-authored-by: Carlos Augusto Gartner <contato@carlosgartner.com.br>
Co-authored-by: Florian Bosdorff <florian.bosdorff@haendlerbund.de>
Co-authored-by: José María Campaña <chemisax@gmail.com>
Co-authored-by: Vivek <viveksh047@webkul.com>
Co-authored-by: namvarii <50305913+namvarii@users.noreply.github.com>
Co-authored-by: Steffen Mahler <steffen.mahler@haendlerbund.de>
Co-authored-by: Herbert Maschke <thyseus@pm.me>
Co-authored-by: SteffenMahler <57138594+SteffenMahler@users.noreply.github.com>
Co-authored-by: Matt April <matthew.japril@gmail.com>
 2020-05-07 14:05:48 +02:00
Annika Wolff 5ec453c9fb bugfix v-validate dates given by datepicker 2020-05-07 12:17:59 +02:00
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
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
Steffen Mahler de1f75df12 fix discount calulation for percentage coupon, various bug fixes in tax rounding, add test 2020-05-05 15:46:02 +02:00
Matt April f32d6edff7 Fixed undefined $state variable when using State based tax rates. 2020-05-04 18:37:23 -04:00
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
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
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
rahulshukla-home 40db94bf25 Issue #2969 2020-04-29 17:21:07 +05:30
rahulshukla-home 2753c7b1d5 configuration added for favicon in admin 2020-04-29 16:35:04 +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
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
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 be3fe03e27
Merge pull request #2959 from jitendra-webkul/1.0 
Issue #2945 fixed
 2020-04-28 20:48:08 +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
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
Jitendra Singh 10b05e58b1
Merge pull request #2955 from rahulcs0082/development 
max price issue in category
 2020-04-28 17:30:50 +05:30
rahulshukla-home abac3a297f max price issue in category 2020-04-28 14:40:08 +05:30