Commit Graph

273 Commits

Author SHA1 Message Date
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
jitendra 7a5c3f1bdc Assets compiled for production 2019-04-23 12:58:47 +05:30
jitendra e99daf28e2 Issue #834 fixed 2019-04-18 12:52:51 +05:30
Jitendra Singh 3984d92fad
Merge pull request #828 from prashant-webkul/development
Development
2019-04-16 15:46:32 +05:30
Jitendra Singh a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
Issue #803 fixed
2019-04-16 15:41:39 +05:30
jitendra eb00f36835 Issue #803 fixed 2019-04-16 15:40:58 +05:30
Prashant Singh af88e8951a Unnecessary Tax models removed from core, were originally moved from core to Tax module 2019-04-16 14:39:30 +05:30
Prashant Singh ca7a5e4a6f Changed the moduleServiceProvider registration back in concord config file. 2019-04-15 16:37:25 +05:30
Prashant Singh 36f6c425c2 Assets compiled for production 2019-04-15 15:14:32 +05:30
Jitendra Singh ebc0befe6a
Merge pull request #813 from naresh-webkul/development
Development
2019-04-10 13:25:43 +05:30
jitendra f3f61e3c91 Optimized performance 2019-04-10 12:10:46 +05:30
naresh verma 642ef2b1c1 reverting config changes 2019-04-09 17:23:37 +05:30
naresh verma b0296a02e0 inventory source mail 2019-04-09 17:04:20 +05:30
jitendra fb6ffaa9d9 JWT implemented for customer api authorization 2019-04-09 16:27:33 +05:30
Prashant Singh 0f8e402380 added version in configuration of Bagisto 2019-04-04 13:03:53 +05:30
Prashant Singh 8af43eb5cc session expiration time now changed to 10 minutes to counter XSRF requests 2019-03-30 18:14:54 +05:30
rahul shukla 00ef14fd3c reverting translation chnages 2019-03-27 14:35:15 +05:30
rahul shukla d4d93739dc product zoom functionality added 2019-03-25 16:32:13 +05:30
rahul shukla dca138ae85 issue #724 2019-03-22 11:58:11 +05:30
jitendra 09a0db3e46 Fallback tranlation set to true in config file 2019-03-15 13:15:42 +05:30
Prashant Singh 20247136a0 disabled side menu toggle for admin, created configuration for product types 2019-03-11 18:39:42 +05:30
jitendra 70c114d3a6 Channel homepage content updated in seeder 2019-01-29 18:32:10 +05:30
Prashant Singh b19f02f5c0 UI issue fix in datagrid mass action master checkbox check and uncheck 2019-01-21 10:56:50 +05:30
Prashant Singh e2037c4892 datagrid's configuration dependency is removed and dynamic row format is back 2019-01-18 10:33:42 +05:30
Prashant Singh f1cae49dab key too long fix by reducing key length to 191 bytes 2019-01-17 15:35:44 +05:30
Prashant Singh e48ac7e295 datagrid sort and filter fixes 2019-01-15 18:55:50 +05:30
Prashant Singh 0607a9e818 set index as abstract method changed to protected property 2019-01-15 16:00:26 +05:30
Prashant Singh 6e966384e5 Disabled customer email verfication and removed the phone field from the customer model 2019-01-15 13:03:41 +05:30
Prashant Singh 11fd8adfff pagination fixes in newly refactored datagrid 2019-01-11 18:35:25 +05:30
Prashant Singh 128e316265 pagination fixes 2019-01-11 16:55:10 +05:30
Prashant Singh 6c8bdf20c0 subtle changes in datagrid done and all datagrids have been refactored 2019-01-10 18:09:46 +05:30
Prashant Singh a4485e2191 merged with master 2019-01-10 11:54:17 +05:30
Prashant Singh f5450cc516 Some fault tolerancy needs to be addressed before completing the refactoring 2019-01-09 17:11:00 +05:30
Prashant Singh 926158cc0d datagrid refactored from backend to frontend, remaining is filters, sorts and searches to be refactored into vue components 2019-01-07 13:37:35 +05:30
Prashant Singh cb0a50233c Datagrid now fault tolerant on not passing select key in its configuration 2019-01-03 16:54:13 +05:30
Prashant Singh 7117038287 datagrid operator bag dependency removed , now operators are already there in Datagrid classes 2019-01-03 15:43:47 +05:30
Prashant Singh 2b32a6252e black listing some key parameters from the request bag and server bag and post bag 2019-01-03 14:53:01 +05:30
rahul shukla 96b7f05c23 bagisto installer , #399 #400 #382 #301 #344 #214 #359 #223 #138 issue fixed 2018-12-31 17:27:32 +05:30
prashant-webkul d9f0ddc89d Fixed issues 314 and 315 2018-12-13 18:51:54 +05:30
jitendra 7f65c3327a Modify menu system and added decimal validator 2018-12-12 15:09:20 +05:30
prashant-webkul 1e05840c7d Regular merge with master 2018-12-07 15:44:03 +05:30
jitendra 9d41172512 Refactor core config system 2018-12-07 12:38:29 +05:30
prashant-webkul 510f6e6f63 minor fixes in the merge cart function of cart 2018-12-03 18:37:29 +05:30
rahul shukla e1b2d1eb01 export for customer 2018-11-29 17:39:39 +05:30
jitendra fb0079bf42 Fixed validation error messages 2018-11-27 10:16:35 +05:30
prashant-webkul 1c27444705 merged 2018-11-21 12:04:54 +05:30
prashant-webkul 662ff09a24 Bug Fixes 2018-11-21 11:59:18 +05:30
prashant-webkul ab9328d755 Auth API implemented using JWT tokens, removed laravel passport 2018-11-19 17:04:13 +05:30
prashant-webkul 14997d6e97 OAuth Using Laravel Passport 2018-11-17 19:26:48 +05:30
prashant-webkul 8c12e35621 Cart Refactored, Email Subscription, UI Bug Fix, Wishlist Order & Invoices Datagrid 2018-11-16 17:21:10 +05:30
jitendra f0ef4f910a Paypal Integration added 2018-11-16 15:41:08 +05:30
jitendra 37625e2a2d Assets compiled for production 2018-11-02 12:39:17 +05:30
jitendra b182325772 Customer address form issues fixed, invoice print feature addred 2018-11-01 19:18:59 +05:30
jitendra b4e79a87ca Editor added to the product edit page, slider form page and channel create and edit form 2018-10-30 16:54:24 +05:30
jitendra 27b1f1fad9 Issues fixed 2018-10-26 19:13:01 +05:30
jitendra 0231c26da2 Final Commit to first version 2018-10-26 13:16:18 +05:30
jitendra 7c63dac032 Fixed remaining issues 2018-10-26 09:50:43 +05:30
jitendra 930cba9436 Issues fixed 2018-10-25 13:16:45 +05:30
jitendra 13ae5d58c0 Dashboard completed 2018-10-23 17:15:44 +05:30
jitendra faab00c3b8 Bug fixed 2018-10-17 16:00:31 +05:30
jitendra d3b73f517c Sales email templates added 2018-10-17 12:51:47 +05:30
prashant-webkul f28f716d9f Bug fixes across the system 2018-10-11 19:55:59 +05:30
jitendra f87a47d798 Order creation completed 2018-10-05 17:29:43 +05:30
prashant-webkul 34833ff995 Path Errors Fixed 2018-09-28 18:58:54 +05:30
jitendra 0bb851d518 Sale package schema added and renamed package cart to checkout 2018-09-28 18:24:26 +05:30
jitendra 9e57c5117b Cart page issues fixedx 2018-09-27 15:31:25 +05:30
jitendra e2bac8a34e Cart fixes 2018-09-26 09:51:14 +05:30
jitendra facf3de81a Checkout shipping and payment steps added 2018-09-21 15:47:01 +05:30
jitendra 31ae7c025e Check process 2018-09-20 15:31:51 +05:30
prashant-webkul e3d1805043 Merged with master 2018-09-19 12:33:06 +05:30
jitendra acd048aaf6 Checkout page 2018-09-19 12:28:15 +05:30
prashant-webkul 9cea4133f7 Case of Cart Merging Left 2018-09-14 18:45:49 +05:30
prashant-webkul b22e82b8cf Mergingchanges 2018-09-13 17:20:12 +05:30
prashant-webkul 0222c97a53 Merging changes with master 2018-09-13 16:57:13 +05:30
rahul shukla 87e5e9a2bc checkout process 2018-09-13 16:46:47 +05:30
rahul shukla 1be2127591 checkout process 2018-09-13 16:40:45 +05:30
prashant-webkul ac093c465b Cart Module being modified accodrding to session 2018-09-13 16:36:17 +05:30
jitendra 160f92b542 Product detail page completed 2018-09-13 16:34:56 +05:30
prashant-webkul 398caff7bc Cart Module in progress 70% 2018-09-11 16:49:40 +05:30
jitendra 9731b499d4 Conflicts resolve 2018-09-11 16:10:57 +05:30
jitendra 5202729391 Configurable options added 2018-09-11 16:00:02 +05:30
rahul shukla b082d73707 customer edit/add & show in admin 2018-09-11 09:41:48 +05:30
jitendra 4fb084557d Commit to master 2018-09-10 15:04:57 +05:30
jitendra c38b1fc7b3 First commit 2018-09-10 14:50:08 +05:30
prashant-webkul 29d83d7b5f Cart Packages files 2018-09-06 11:50:30 +05:30
jitendra bc087010ee Repository pattern changes 2018-08-22 15:14:35 +05:30