Commit Graph

258 Commits

Author SHA1 Message Date
jitendra 37e7c4c834 Merged with master 2020-08-10 19:02:15 +05:30
jitendra 44181411bd Multi theme system now supported in admin 2020-08-10 19:00:31 +05:30
Herbert Maschke 3670a6210b introduce ability to make original and copy be linked to each other 2020-08-10 09:31:56 +02:00
Herbert Maschke 96e6c56375 doc improvements 2020-08-07 21:48:13 +02:00
Herbert Maschke 80d2cda443 add ability to skip product attributes when doing a copy 2020-08-03 13:32:26 +02:00
ghermans 8c4e1bbc3b Fixed #3595 2020-07-29 22:23:15 +02:00
jitendra 2adb5f26d3 Added blade file hint feature for frontend 2020-07-13 21:44:56 +05:30
jitendra fa05bc8f0a Issue #3425 fixed 2020-07-06 13:22:46 +05:30
jitendra 03b6f679bf Remove defaul scout driver from scout config 2020-07-02 17:15:27 +05:30
jitendra 75a40efccd Remove defaul scout driver from scout config 2020-07-02 17:09:51 +05:30
jitendra e5f90b92d0 Added support for search with algolia and elasticsearch 2020-07-02 17:00:21 +05:30
Pranshu Tomar 4681205f17 Social login completed 2020-06-26 19:09:53 +05:30
Pranshu Tomar c9d59c6f38 Issue #3254 fixed 2020-06-17 12:44:18 +05:30
Pranshu Tomar 5b398574ae Migrate to laravel 7 2020-06-09 12:54:46 +05:30
Pranshu Tomar 10c31e27ad Updated change log file 2020-04-28 18:59:18 +05:30
Pranshu Tomar b3b20a904c Auto exchange rate feature added 2020-04-27 19:57:13 +05:30
Jitendra Singh 792720354f Version updated 2020-03-19 19:04:33 +05:30
Vivek 1572075443 [Updated: worked on conflict.] 2020-03-16 11:10:07 +05:30
Vivek c9062abd1f [Updated: resolved config/concord.php conflict.] 2020-03-16 11:02:51 +05:30
Vivek fcbaec6676 [Updated: resolved config/concord.php conflict.] 2020-03-16 10:58:27 +05:30
Vivek 5c11e05893 [Updated: resolved config/concord.php conflict.] 2020-03-16 10:57:20 +05:30
Vivek aea33cfc68 [Updated: resolved config/concord.php conflict.] 2020-03-16 10:48:01 +05:30
Jitendra Singh 557e619bdc Issues #2634, #2635 fixed 2020-03-13 12:52:26 +05:30
Vivek Sharma ffd918af20 [Updated: Changed Velocity's models related code.] 2020-03-07 11:43:22 +05:30
Jitendra Singh 0f42e8ff8f Resolved conflicts 2020-02-27 12:07:20 +05:30
ghermans 3365924529 #2525 updated config file 2020-02-25 03:30:13 +01:00
ghermans bb9c90d0a2 #2525 Added locale, timezone and currency 2020-02-25 03:29:33 +01:00
Jitendra Singh 5c696f8d00 Resolved conflicts 2020-02-21 19:36:17 +05:30
Jitendra Singh fa53b72058 Booking product type added 2020-02-14 11:40:12 +05:30
Steffen Mahler ae467fc182 merge master, refactoring tests 2020-02-04 18:13:09 +01:00
Steffen Mahler dd8f653df4 minor improvements 2020-02-04 14:48:15 +01:00
Steffen Mahler 01010db842 set default_country to null, add fallback for test 2020-02-04 14:38:52 +01:00
Steffen Mahler 763ccf3af9 set default_country to EN 2020-02-04 14:33:25 +01:00
Steffen Mahler 8abce3302a tax helper introduced, views changed to display multiple tax rates 2020-01-31 16:08:01 +01:00
shubhammehrotra.symfony@webkul.com d23d3b4f8c search in particular category 2020-01-29 17:33:28 +05:30
shubhammehrotra.symfony@webkul.com 1b368789e5 bagisto velocity theme updates 2020-01-26 14:17:05 +05:30
Jitendra Singh 5a104142f3
Revert "Bagisto theme added" 2020-01-25 13:07:55 +05:30
shubhammehrotra.symfony@webkul.com 3f377c929e Merge branch 'master' of https://github.com/bagisto/bagisto into velocity 2020-01-24 18:52:45 +05:30
Jitendra Singh 92636543cd
Merge pull request #1970 from Haendlerbund/introduce-default-country
introduce default_country application configuration key
2020-01-21 16:34:38 +05:30
rahul shukla 4f1e20d23c conflict resolve 2020-01-21 15:28:16 +05:30
rahul shukla 82dbdee0b8 helper functions updated 2020-01-21 15:23:04 +05:30
rahul shukla debf060b03 helper function updated 2020-01-21 15:13:01 +05:30
shubhammehrotra.symfony@webkul.com 81d9d34acc velocity-configuration-added 2020-01-16 13:22:18 +05:30
shubhammehrotra.symfony@webkul.com 7c1bd634f2 remove velocity 2020-01-16 13:09:33 +05:30
shubhammehrotra.symfony@webkul.com 485fbcb1c5 Merge branch 'velocity' of github.com:shubhwebkul/bagisto into velocity 2020-01-16 13:05:55 +05:30
Jitendra Singh 939895cb88
Merge pull request #2041 from jitendra-webkul/1.0
Issue #1760 fixed
2020-01-13 18:51:37 +05:30
Jitendra Singh c435b6c121 Issue #1760 fixed 2020-01-13 18:50:36 +05:30
Jitendra Singh 3fd0a04dde
Merge pull request #2025 from jitendra-webkul/1.0
Issue #1820 fixed
2020-01-10 15:52:03 +05:30
Jitendra Singh 0f52762c3c Issue #1820 fixed 2020-01-10 15:50:39 +05:30
Jitendra Singh 3a52d63ac9
Merge pull request #1985 from rabol/master
Make it possible to specify timezone in .env
2020-01-10 13:32:30 +05:30
Jitendra Singh 14869df230 Issue #1979 fixexd 2020-01-09 17:03:58 +05:30
shubhammehrotra.symfony@webkul.com 242446627b merged with original 2020-01-07 13:10:34 +05:30
shubhammehrotra.symfony@webkul.com 408c9af744 updates 2019-12-30 20:18:35 +05:30
rabol 0abc5ec43e Make it possible to specify currency in .env 2019-12-28 11:22:41 +01:00
rabol a63c2f9fd8 Make it possible to specify timezone in .env 2019-12-28 10:38:54 +01:00
shubhammehrotra.symfony@webkul.com fe43e6535d sidebar updates 2019-12-27 09:43:59 +05:30
shubhammehrotra.symfony@webkul.com 113c5753d7 velocity initial 2019-12-26 18:05:21 +05:30
David Große c346770ab1 introduce default_country application configuration key 2019-12-23 14:28:54 +01:00
jitendra 2380c1b597 Merged with master 2019-12-21 10:58:46 +05:30
jitendra 513b07e4cf Added new cart rule and catalog rule 2019-12-21 10:55:32 +05:30
Jitendra Singh c26bf6c820
Merge pull request #1701 from MattApril/env-fix
Replace env() function usage with config() function, when outside of config file context
2019-12-18 12:38:00 +05:30
naresh verma 183cbf34cf resolve table prefix issue 2019-12-05 13:21:52 +05:30
Herbert Maschke ebcc66ab59 remove alkhachatryan/laravel-web-console 2019-11-25 08:02:55 +01:00
Alexey 25ea011960 Adding Laravel Web Console to the Bagisto 2019-11-13 01:15:56 +04:00
Matt April 54babf9079 Moved ADMIN_MAIL_TO into mail config 2019-10-26 11:07:41 -04:00
jitendra 937fda187f Issue #1620, #1671 fixed 2019-10-22 17:38:35 +05:30
jitendra 822b6014b4 Issue #1676 fixed 2019-10-22 11:03:42 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
rahul shukla 58331043e9 translatable package update 2019-09-20 14:49:53 +05:30
jitendra 45f1ea4b83 Merge with master 2019-09-04 15:05:03 +05:30
Prashant Singh f1f0bcac8c Dead mods removed 2019-09-03 12:24:20 +05:30
Prashant Singh 49c2f1c9d8 Slider content work complete 2019-08-23 18:01:44 +05:30
Prashant Singh 0c79d87503 Removed stripe fees visibility from every where 2019-08-23 13:15:10 +05:30
Prashant Singh b62b277cac Integrated GTM 2019-08-23 08:56:25 +05:30
Prashant Singh a29409b1a4 Base sync 2019-08-19 16:11:09 +05:30
jitendra e2bd18e916 Resolved conflicts 2019-08-19 16:01:38 +05:30
Prashant Singh 06a4f1216b Dead code removal 2019-08-09 19:29:28 +05:30
Prashant Singh fbedc8a161 Added env's shop_mail_from param param in all mails related to customers and shop 2019-08-06 20:00:28 +05:30
Prashant Singh 9ca97aa594 CMS implemented 2019-08-02 19:51:28 +05:30
Prashant Singh b1285fa243 Static page CMS sprint one complete, preview page is not loading CSS and JS from shop layout 2019-08-02 04:30:19 +05:30
Prashant Singh 9b0c3456e5 Modules preorder, customer document and group catalog updated 2019-07-30 16:22:27 +05:30
Prashant Singh c6bc5ba1c3 Added support for fixer for fetching rates 2019-07-15 18:24:36 +05:30
Prashant Singh d0b8a1f50f Added fixer-io api key provision in bagisto for exchange rated 2019-07-15 16:08:16 +05:30
Prashant Singh 88611c9d84 Fixed issue #1172 2019-07-11 09:49:32 +05:30
Prashant Singh b91d8a07d6 Added excluded usernames list so that illegal domain entries cannot be done 2019-07-08 17:32:12 +05:30
jitendra a514ad5c02 Added jwt service provider to app.php 2019-07-03 15:16:06 +05:30
jitendra 149b5bf17a Updated cocord.php 2019-07-02 18:18:51 +05:30
Prashant Singh bebf5e105b Base sync with github master 2019-06-27 13:11:48 +05:30
jitendra 2a5e8b1ddd Removed propaganistas/laravel-intl dependency 2019-06-27 13:01:47 +05:30
Prashant Singh 3382ffc076 Customer group catalog fixed 2019-06-24 19:23:20 +05:30
Prashant Singh c3bfcf5d79 Show price after login modified 2019-06-22 13:53:36 +05:30
Prashant Singh 6fd67e56d7 New repo with base sync 2019-06-22 01:02:33 +05:30
Prashant Singh 264d2e3c9e Added cart rule validation function which validates the cart rule and added unique coupon check while creating or updating couponable cart rule 2019-06-20 13:03:01 +05:30
Prashant Singh 9e80687960 Fixed customer group bug in cart rule and fixed a bug in coupon apply rule 2019-06-18 19:00:24 +05:30
Prashant Singh ea185aad7b Discount package bug fixes and complete refactor with overriding features for actions 2019-06-17 08:56:30 +05:30
rahul shukla 7b14de69c6 changes in config & composer 2019-06-13 14:56:04 +05:30
rahul shukla 1a84a016fa bulk add to cart 2019-06-11 16:22:01 +05:30
rahul shukla 8e37ebe7d5 conflict resolve 2019-06-10 17:13:30 +05:30
rahul shukla 80ac7bba72 customer document 2019-06-10 17:11:56 +05:30
Prashant Singh 6da603530e
Cart rule inside promotions, various improvements and fixes. (#964)
* Some syntax issue fixes

* Adding discount things inside promotions in admin

* routes updated for creating discount rules

* fixed customer profile redirect parameter issue

* added cart and catalog rule routes to admin section

* migrations for discount almost to be finished, final revision left

* migrations for discounts complete

* catalog rule form underway

* catalog rule

* Made some dynamic form fields in catalog rule create form

* made some changes for custom validations used in ProductForm request class

* working on prepopulating the values fields in conditions

* need another revisit on discount rules tables and then prepare for actions

* removed discounts table

* catalog rule form changed to muliti attribute set for single condition

* new icons added for promotion and customer note. new action for customer added to take notes on the customers

* catalog and cart rule designs stable, now moving towards validations on client side and backend

* catalog rules migrations added

* catalog rule models added with contracts and proxies

* fixed customer group bug in customer registration controller

* fixed customer registration bug due to last fix

* fixed product card image not found issue

* catalog rule translations added

* Added migrations for cart rules and catalog rule products their contracts and remaining necessary files related to them.

* making cart attributes for cart rules

* Added more fields for cart rules

* working on conditions for cart rule form

* minor changes in migrations related to price rules

* currency and locale switcher now only available for a channel on storefront when more than on locale and currency are assigned to that channel

* part of conditions on the cart rule form added

* daily sync

* cart rate migrations updated

* Added select and multi select attributes options fetching with ajax on catalog rule form

* changed some migrations and data being populated at runtime inside catalog rule form

* catalog rule create complete, migrations changes, translations added

* catalog rule edit form complete

* catalog rule form complete, now moving towards catalog rule products

* added delete functionality for catalog rules

* added cart rule preferences for coupon codes

* cart rule submission problem due to repository issue

* Cart rule form and migrations complete

* Models and Repositories updated for cart rule usage

* base sync with master

* designing process to get suitable discount rules

* cart rule form completed

* added helpers in cart and discount to apply rules on cart at checkout or not

* cart rule coupon implementation in progress for discount coupon in shop checkout pages

* cart rules working

* added coupon box on checkout screen

* removed the conditions empty bug

* Nearing to completion of coupon based rules

* made some changes in cart rule coupon application on checkout related to new designs

* some bug fixes

* calculation for automatic cart rules complete

* non couponable cart rules implemented, now moving on to binding them on frontend

* some conditions improvements in couponable cart rules

* some bug fixes

* removed some bugs from summary blade for cart rule

* added the table for cart rule cart for managing rules with cart and removed various bug fixes

* some bug fixes

* Removed bugs and added coupon based cart rule removal functionality

* some bug fixes

* cart rule labels refactoring in midway

* Cart rule labels bug fixed

* removed margin classes from shop to UI

* Refactoring cart rule on front end

* added checks

* Discount rule implemented.

* cart rule bug fixes

* provision to remove the couponable and non couponable rule had been added

* Cart rule frontend work done

* altered some frontend variables on onepage checkout

* Altered cart rules to some extent
2019-06-10 13:19:05 +05:30