792720354f
Version updated
2020-03-19 19:04:33 +05:30
1572075443
[Updated: worked on conflict.]
2020-03-16 11:10:07 +05:30
c9062abd1f
[Updated: resolved config/concord.php conflict.]
2020-03-16 11:02:51 +05:30
fcbaec6676
[Updated: resolved config/concord.php conflict.]
2020-03-16 10:58:27 +05:30
5c11e05893
[Updated: resolved config/concord.php conflict.]
2020-03-16 10:57:20 +05:30
aea33cfc68
[Updated: resolved config/concord.php conflict.]
2020-03-16 10:48:01 +05:30
557e619bdc
Issues #2634 , #2635 fixed
2020-03-13 12:52:26 +05:30
ffd918af20
[Updated: Changed Velocity's models related code.]
2020-03-07 11:43:22 +05:30
0f42e8ff8f
Resolved conflicts
2020-02-27 12:07:20 +05:30
3365924529
#2525 updated config file
2020-02-25 03:30:13 +01:00
bb9c90d0a2
#2525 Added locale, timezone and currency
2020-02-25 03:29:33 +01:00
5c696f8d00
Resolved conflicts
2020-02-21 19:36:17 +05:30
fa53b72058
Booking product type added
2020-02-14 11:40:12 +05:30
ae467fc182
merge master, refactoring tests
2020-02-04 18:13:09 +01:00
dd8f653df4
minor improvements
2020-02-04 14:48:15 +01:00
01010db842
set default_country to null, add fallback for test
2020-02-04 14:38:52 +01:00
763ccf3af9
set default_country to EN
2020-02-04 14:33:25 +01:00
8abce3302a
tax helper introduced, views changed to display multiple tax rates
2020-01-31 16:08:01 +01:00
d23d3b4f8c
search in particular category
2020-01-29 17:33:28 +05:30
1b368789e5
bagisto velocity theme updates
2020-01-26 14:17:05 +05:30
5a104142f3
Revert "Bagisto theme added"
2020-01-25 13:07:55 +05:30
3f377c929e
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity
2020-01-24 18:52:45 +05:30
92636543cd
Merge pull request #1970 from Haendlerbund/introduce-default-country
...
introduce default_country application configuration key
2020-01-21 16:34:38 +05:30
4f1e20d23c
conflict resolve
2020-01-21 15:28:16 +05:30
82dbdee0b8
helper functions updated
2020-01-21 15:23:04 +05:30
debf060b03
helper function updated
2020-01-21 15:13:01 +05:30
81d9d34acc
velocity-configuration-added
2020-01-16 13:22:18 +05:30
7c1bd634f2
remove velocity
2020-01-16 13:09:33 +05:30
485fbcb1c5
Merge branch 'velocity' of github.com:shubhwebkul/bagisto into velocity
2020-01-16 13:05:55 +05:30
939895cb88
Merge pull request #2041 from jitendra-webkul/1.0
...
Issue #1760 fixed
2020-01-13 18:51:37 +05:30
c435b6c121
Issue #1760 fixed
2020-01-13 18:50:36 +05:30
3fd0a04dde
Merge pull request #2025 from jitendra-webkul/1.0
...
Issue #1820 fixed
2020-01-10 15:52:03 +05:30
0f52762c3c
Issue #1820 fixed
2020-01-10 15:50:39 +05:30
3a52d63ac9
Merge pull request #1985 from rabol/master
...
Make it possible to specify timezone in .env
2020-01-10 13:32:30 +05:30
14869df230
Issue #1979 fixexd
2020-01-09 17:03:58 +05:30
242446627b
merged with original
2020-01-07 13:10:34 +05:30
408c9af744
updates
2019-12-30 20:18:35 +05:30
0abc5ec43e
Make it possible to specify currency in .env
2019-12-28 11:22:41 +01:00
a63c2f9fd8
Make it possible to specify timezone in .env
2019-12-28 10:38:54 +01:00
fe43e6535d
sidebar updates
2019-12-27 09:43:59 +05:30
113c5753d7
velocity initial
2019-12-26 18:05:21 +05:30
c346770ab1
introduce default_country application configuration key
2019-12-23 14:28:54 +01:00
2380c1b597
Merged with master
2019-12-21 10:58:46 +05:30
513b07e4cf
Added new cart rule and catalog rule
2019-12-21 10:55:32 +05:30
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
183cbf34cf
resolve table prefix issue
2019-12-05 13:21:52 +05:30
ebcc66ab59
remove alkhachatryan/laravel-web-console
2019-11-25 08:02:55 +01:00
25ea011960
Adding Laravel Web Console to the Bagisto
2019-11-13 01:15:56 +04:00
54babf9079
Moved ADMIN_MAIL_TO into mail config
2019-10-26 11:07:41 -04:00
937fda187f
Issue #1620 , #1671 fixed
2019-10-22 17:38:35 +05:30
822b6014b4
Issue #1676 fixed
2019-10-22 11:03:42 +05:30
5e754cbdfe
Resoloved conflicts
2019-10-09 17:12:57 +05:30
58331043e9
translatable package update
2019-09-20 14:49:53 +05:30
45f1ea4b83
Merge with master
2019-09-04 15:05:03 +05:30
f1f0bcac8c
Dead mods removed
2019-09-03 12:24:20 +05:30
49c2f1c9d8
Slider content work complete
2019-08-23 18:01:44 +05:30
0c79d87503
Removed stripe fees visibility from every where
2019-08-23 13:15:10 +05:30
b62b277cac
Integrated GTM
2019-08-23 08:56:25 +05:30
a29409b1a4
Base sync
2019-08-19 16:11:09 +05:30
e2bd18e916
Resolved conflicts
2019-08-19 16:01:38 +05:30
06a4f1216b
Dead code removal
2019-08-09 19:29:28 +05:30
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
9ca97aa594
CMS implemented
2019-08-02 19:51:28 +05:30
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
9b0c3456e5
Modules preorder, customer document and group catalog updated
2019-07-30 16:22:27 +05:30
c6bc5ba1c3
Added support for fixer for fetching rates
2019-07-15 18:24:36 +05:30
d0b8a1f50f
Added fixer-io api key provision in bagisto for exchange rated
2019-07-15 16:08:16 +05:30
88611c9d84
Fixed issue #1172
2019-07-11 09:49:32 +05:30
b91d8a07d6
Added excluded usernames list so that illegal domain entries cannot be done
2019-07-08 17:32:12 +05:30
a514ad5c02
Added jwt service provider to app.php
2019-07-03 15:16:06 +05:30
149b5bf17a
Updated cocord.php
2019-07-02 18:18:51 +05:30
bebf5e105b
Base sync with github master
2019-06-27 13:11:48 +05:30
2a5e8b1ddd
Removed propaganistas/laravel-intl dependency
2019-06-27 13:01:47 +05:30
3382ffc076
Customer group catalog fixed
2019-06-24 19:23:20 +05:30
c3bfcf5d79
Show price after login modified
2019-06-22 13:53:36 +05:30
6fd67e56d7
New repo with base sync
2019-06-22 01:02:33 +05:30
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
9e80687960
Fixed customer group bug in cart rule and fixed a bug in coupon apply rule
2019-06-18 19:00:24 +05:30
ea185aad7b
Discount package bug fixes and complete refactor with overriding features for actions
2019-06-17 08:56:30 +05:30
7b14de69c6
changes in config & composer
2019-06-13 14:56:04 +05:30
1a84a016fa
bulk add to cart
2019-06-11 16:22:01 +05:30
8e37ebe7d5
conflict resolve
2019-06-10 17:13:30 +05:30
80ac7bba72
customer document
2019-06-10 17:11:56 +05:30
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
7a5c3f1bdc
Assets compiled for production
2019-04-23 12:58:47 +05:30
e99daf28e2
Issue #834 fixed
2019-04-18 12:52:51 +05:30
3984d92fad
Merge pull request #828 from prashant-webkul/development
...
Development
2019-04-16 15:46:32 +05:30
a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
...
Issue #803 fixed
2019-04-16 15:41:39 +05:30
eb00f36835
Issue #803 fixed
2019-04-16 15:40:58 +05:30
af88e8951a
Unnecessary Tax models removed from core, were originally moved from core to Tax module
2019-04-16 14:39:30 +05:30
ca7a5e4a6f
Changed the moduleServiceProvider registration back in concord config file.
2019-04-15 16:37:25 +05:30
36f6c425c2
Assets compiled for production
2019-04-15 15:14:32 +05:30
ebc0befe6a
Merge pull request #813 from naresh-webkul/development
...
Development
2019-04-10 13:25:43 +05:30
f3f61e3c91
Optimized performance
2019-04-10 12:10:46 +05:30
642ef2b1c1
reverting config changes
2019-04-09 17:23:37 +05:30
b0296a02e0
inventory source mail
2019-04-09 17:04:20 +05:30
fb6ffaa9d9
JWT implemented for customer api authorization
2019-04-09 16:27:33 +05:30
0f8e402380
added version in configuration of Bagisto
2019-04-04 13:03:53 +05:30
8af43eb5cc
session expiration time now changed to 10 minutes to counter XSRF requests
2019-03-30 18:14:54 +05:30
00ef14fd3c
reverting translation chnages
2019-03-27 14:35:15 +05:30
d4d93739dc
product zoom functionality added
2019-03-25 16:32:13 +05:30
dca138ae85
issue #724
2019-03-22 11:58:11 +05:30
09a0db3e46
Fallback tranlation set to true in config file
2019-03-15 13:15:42 +05:30
20247136a0
disabled side menu toggle for admin, created configuration for product types
2019-03-11 18:39:42 +05:30
70c114d3a6
Channel homepage content updated in seeder
2019-01-29 18:32:10 +05:30
b19f02f5c0
UI issue fix in datagrid mass action master checkbox check and uncheck
2019-01-21 10:56:50 +05:30
e2037c4892
datagrid's configuration dependency is removed and dynamic row format is back
2019-01-18 10:33:42 +05:30
f1cae49dab
key too long fix by reducing key length to 191 bytes
2019-01-17 15:35:44 +05:30
e48ac7e295
datagrid sort and filter fixes
2019-01-15 18:55:50 +05:30
0607a9e818
set index as abstract method changed to protected property
2019-01-15 16:00:26 +05:30
6e966384e5
Disabled customer email verfication and removed the phone field from the customer model
2019-01-15 13:03:41 +05:30
11fd8adfff
pagination fixes in newly refactored datagrid
2019-01-11 18:35:25 +05:30
128e316265
pagination fixes
2019-01-11 16:55:10 +05:30
6c8bdf20c0
subtle changes in datagrid done and all datagrids have been refactored
2019-01-10 18:09:46 +05:30
a4485e2191
merged with master
2019-01-10 11:54:17 +05:30
f5450cc516
Some fault tolerancy needs to be addressed before completing the refactoring
2019-01-09 17:11:00 +05:30
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
cb0a50233c
Datagrid now fault tolerant on not passing select key in its configuration
2019-01-03 16:54:13 +05:30
7117038287
datagrid operator bag dependency removed , now operators are already there in Datagrid classes
2019-01-03 15:43:47 +05:30
2b32a6252e
black listing some key parameters from the request bag and server bag and post bag
2019-01-03 14:53:01 +05:30
96b7f05c23
bagisto installer , #399 #400 #382 #301 #344 #214 #359 #223 #138 issue fixed
2018-12-31 17:27:32 +05:30
d9f0ddc89d
Fixed issues 314 and 315
2018-12-13 18:51:54 +05:30
7f65c3327a
Modify menu system and added decimal validator
2018-12-12 15:09:20 +05:30
1e05840c7d
Regular merge with master
2018-12-07 15:44:03 +05:30
9d41172512
Refactor core config system
2018-12-07 12:38:29 +05:30
510f6e6f63
minor fixes in the merge cart function of cart
2018-12-03 18:37:29 +05:30
e1b2d1eb01
export for customer
2018-11-29 17:39:39 +05:30
fb0079bf42
Fixed validation error messages
2018-11-27 10:16:35 +05:30
1c27444705
merged
2018-11-21 12:04:54 +05:30
662ff09a24
Bug Fixes
2018-11-21 11:59:18 +05:30
ab9328d755
Auth API implemented using JWT tokens, removed laravel passport
2018-11-19 17:04:13 +05:30
14997d6e97
OAuth Using Laravel Passport
2018-11-17 19:26:48 +05:30
8c12e35621
Cart Refactored, Email Subscription, UI Bug Fix, Wishlist Order & Invoices Datagrid
2018-11-16 17:21:10 +05:30
f0ef4f910a
Paypal Integration added
2018-11-16 15:41:08 +05:30
37625e2a2d
Assets compiled for production
2018-11-02 12:39:17 +05:30
b182325772
Customer address form issues fixed, invoice print feature addred
2018-11-01 19:18:59 +05:30
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
27b1f1fad9
Issues fixed
2018-10-26 19:13:01 +05:30
0231c26da2
Final Commit to first version
2018-10-26 13:16:18 +05:30
7c63dac032
Fixed remaining issues
2018-10-26 09:50:43 +05:30
930cba9436
Issues fixed
2018-10-25 13:16:45 +05:30
13ae5d58c0
Dashboard completed
2018-10-23 17:15:44 +05:30
faab00c3b8
Bug fixed
2018-10-17 16:00:31 +05:30
d3b73f517c
Sales email templates added
2018-10-17 12:51:47 +05:30
f28f716d9f
Bug fixes across the system
2018-10-11 19:55:59 +05:30
f87a47d798
Order creation completed
2018-10-05 17:29:43 +05:30
34833ff995
Path Errors Fixed
2018-09-28 18:58:54 +05:30
0bb851d518
Sale package schema added and renamed package cart to checkout
2018-09-28 18:24:26 +05:30
9e57c5117b
Cart page issues fixedx
2018-09-27 15:31:25 +05:30
e2bac8a34e
Cart fixes
2018-09-26 09:51:14 +05:30
Jitendra Singh
Vivek
ghermans
Steffen Mahler
shubhammehrotra.symfony@webkul.com
Jitendra Singh
rahul shukla
rabol
David Große
naresh verma
Herbert Maschke
Alexey
Matt April
Prashant Singh
Prashant Singh