3c5a2792e3
Removed configurable checks and deleted unwanted files
2019-09-04 16:23:05 +05:30
45f1ea4b83
Merge with master
2019-09-04 15:05:03 +05:30
eafa585cb8
Order creation completed for bundle product
2019-09-03 15:46:13 +05:30
7352a97797
Bundle product data save completed
2019-08-21 19:24:26 +05:30
afafdfbfcd
Fixed issue #1327
2019-08-20 16:48:11 +05:30
e2bd18e916
Resolved conflicts
2019-08-19 16:01:38 +05:30
29e4851bfb
Group product added
2019-08-19 15:00:24 +05:30
b7bc6344bb
Merge pull request #1313 from prashant-webkul/development
...
Development
2019-08-19 13:56:04 +05:30
aca7b4c6c7
Catalog rule tie breaker content in progress
2019-08-17 20:18:39 +05:30
a8ff894d6c
Merge pull request #1310 from prashant-webkul/development
...
Fixed channel locale issue in cms datagrid
2019-08-17 15:49:18 +05:30
bb972c6e48
CMS Bug fixes and updated readme
2019-08-17 15:42:24 +05:30
a849ae9fc0
Merge pull request #1272 from prashant-webkul/development
...
Development
2019-08-09 19:12:44 +05:30
763a380870
new customer notification, isssue #1247
2019-08-05 20:23:48 +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
dfd6ea8c25
Translations fixes in promotions sections
2019-07-23 13:07:22 +05:30
52e3a64380
Made all submit buttons of create and update buttons style to fixed
2019-07-18 10:10:49 +05:30
c6bc5ba1c3
Added support for fixer for fetching rates
2019-07-15 18:24:36 +05:30
366a5fdd20
Refactor code standard
2019-07-01 17:03:36 +05:30
3ef416b22e
Added downloadable order item info
2019-06-29 17:51:49 +05:30
ad6e422fdb
Added downloadable and virtual products
2019-06-29 15:23:34 +05:30
55b71e1e66
updated
2019-06-28 19:48:52 +05:30
9eaf46a4d1
Merge pull request #1123 from prashant-webkul/development
...
Product export now added
2019-06-27 14:59:42 +05:30
487484f86d
Product export now added
2019-06-27 14:55:32 +05:30
4627c6a519
Merge pull request #1122 from prashant-webkul/development
...
Development
2019-06-27 14:43:51 +05:30
c245eab856
Fixed issue #1086 for customer edit
2019-06-27 14:41:01 +05:30
a9090e991c
download for image & file type
2019-06-27 14:38:24 +05:30
d1395ba145
Fixed issue #1086
2019-06-27 14:24:26 +05:30
be8c11aa98
issue #1069
2019-06-19 16:32:38 +05:30
d18667351c
Base sync
2019-06-17 12:38:29 +05:30
ba31ecd527
Cart rule create and edit forms bug fixes
2019-06-16 22:18:19 +05:30
a2d1e1aa85
Column 'code' added in customer_groups table
2019-06-15 18:50:38 +05:30
65f899dcfe
Merge pull request #1038 from jitendra-webkul/jitendra
...
Guest removed from customer pages
2019-06-15 16:35:42 +05:30
ff64d23319
Guest removed from customer pages
2019-06-15 16:34:56 +05:30
1e865986c4
improved conditions check in applying cart rules
2019-06-14 19:24:15 +05:30
6c0ee913ed
added mass actions in admin customers grid
2019-06-13 12:47:58 +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
796e76564c
Merge pull request #974 from imanghafoori1/clean_up_config
...
clean up
2019-06-06 17:47:10 +05:30
99ccac943d
fix bug
2019-06-06 16:25:06 +04:30
9f039cb9a5
clean up
...
- optimized imports
- remove unused variable
- extract a method
- flatten code
2019-06-04 14:45:16 +04:30
e0dd74c06c
clean up
2019-06-04 00:52:37 +04:30
fe8ac5abf1
issue #957 change in event
2019-05-29 09:56:28 +05:30
75e74dfb7e
issue #867 shipment issue
2019-04-24 17:57:16 +05:30
1ca1ae5b61
Changed responses for all backend destroy functions and removed dead commented code
2019-04-09 13:17:19 +05:30
b3bf66c6e2
Base sync with master
2019-04-09 12:53:31 +05:30
75ef9cd530
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-09 12:50:09 +05:30
6a4cb016c4
fixed issue #750
2019-04-09 06:31:52 +05:30
4bd89950ce
change update & delete query in controller & comment added
2019-04-08 16:48:43 +05:30
747f214739
fix in progress for get routes performing actions more than redirect
2019-04-08 04:51:02 +05:30
d0e5e6a88f
Merge pull request #786 from imanghafoori1/flatten_code
...
Flatten code
2019-04-03 14:49:06 +05:30
759782c735
fix doc blocks ( #787 )
2019-04-03 12:34:35 +05:30
14cd4eb97e
flatten code
2019-04-02 21:50:44 +03:30
a84b81f446
flatten code
2019-04-01 18:39:15 +03:30
1a4c040894
remove unused code
2019-04-01 18:38:18 +03:30
5fc85dffe4
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-14 11:01:04 +05:30
281567456b
product linking completed
2019-03-13 10:33:43 +05:30
3bb197c75a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-13 09:38:36 +05:30
9b82321d4f
change in related products
2019-03-12 21:05:10 +05:30
c9c5208693
Updated the list of exportable grids
2019-03-12 12:19:28 +05:30
9578f7609b
export functionality refactored
2019-03-12 12:13:48 +05:30
9eb1deb3fa
Datagrid export functionality refactoring
2019-03-12 11:07:12 +05:30
238c248852
Filterable checks implemented in datagrid
2019-03-11 19:36:15 +05:30
f68c4e482c
Fixed bug #575
2019-02-15 09:51:38 +05:30
e4bdf11a7d
lang added
2019-02-13 17:42:07 +05:30
15ae803407
merge with master
2019-02-11 17:18:06 +05:30
7bfb216bb0
Dashboard sql issue fixed
2019-02-11 15:13:38 +05:30
fdcf420af9
import for tax rate
2019-02-08 16:53:48 +05:30
2d99b565b1
Merge pull request #509 from rahulshukla-webkul/development
...
configuration changes
2019-02-01 16:48:25 +05:30
2d1a816349
Issue #514 fixed
2019-02-01 12:19:30 +05:30
41d3f74fc1
configuration changes
2019-01-31 17:04:32 +05:30
ee91d69361
configuration changes
2019-01-31 15:18:36 +05:30
2f8178afc0
file & image field for configuration
2019-01-30 21:25:38 +05:30
9c934d8e8d
issues #401
2019-01-28 15:04:45 +05:30
3289ab8a4a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-21 12:39:36 +05:30
9eeaee1c66
migration changes in the product flat table
2019-01-19 15:35:12 +05:30
50a0a71196
product flat column creation and deletion on the basis of attributes
2019-01-18 17:36:58 +05:30
63f141e3bd
Merge pull request #472 from jitendra-webkul/jitendra
...
Issues fixed
2019-01-18 16:41:22 +05:30
fbbf1fe99f
Issues fixed
2019-01-18 16:40:40 +05:30
d50bb3e962
configuration message
2019-01-17 20:22:01 +05:30
e018d6555f
export issue
2019-01-17 15:17:44 +05:30
8c32a21521
export changes
2019-01-16 16:43:36 +05:30
4747f8fb59
customer design fixex
2019-01-16 14:08:39 +05:30
aae6593469
Coding standard updated
2019-01-15 17:24:41 +05:30
6e966384e5
Disabled customer email verfication and removed the phone field from the customer model
2019-01-15 13:03:41 +05:30
9c1612d0ab
Assets compiled for production
2019-01-11 15:31:10 +05:30
f1371fd6a0
Product inventory management updated
2019-01-11 14:51:20 +05:30
a4485e2191
merged with master
2019-01-10 11:54:17 +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
33ac4c1319
multiselect for configuration
2019-01-04 11:13:24 +05:30
0bf6699746
issues fixes #320 #288 #309
2019-01-02 20:12:49 +05:30
29ab4f1da9
merge with master
2018-12-31 18:51:42 +05:30
96b7f05c23
bagisto installer , #399 #400 #382 #301 #344 #214 #359 #223 #138 issue fixed
2018-12-31 17:27:32 +05:30
0b3ba4f06a
Modified inventory selection during shipment creation
2018-12-26 18:34:49 +05:30
2e668c7020
Inventory source selection feature added during shipment creation
2018-12-26 15:30:23 +05:30
95161d9101
changes in config
2018-12-26 14:59:52 +05:30
1e25226997
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
2018-12-26 14:47:50 +05:30
9bb9ae5ce7
configuration changes
2018-12-26 14:46:27 +05:30
affcca3d08
fixed issue #304
2018-12-22 16:12:42 +05:30
5916482f7c
Add fire event on every controller
2018-12-21 18:18:34 +05:30
ef72b4d629
export button & review
2018-12-20 16:38:47 +05:30
c943fa3603
Compile assets from production
2018-12-19 15:05:23 +05:30
0cf2fc4baf
Issues fixed
2018-12-19 15:00:40 +05:30
dfb4e5f210
subscription exception issue #337 fixed
2018-12-19 14:57:44 +05:30
3c8807e7e9
merge conflicts removed
2018-12-18 18:17:01 +05:30
40fafca930
Configuration redirect to first config page fixed
2018-12-18 13:41:25 +05:30
9cdc16a50b
conflict resolve
2018-12-18 13:39:15 +05:30
c4416bc228
Removed conflicts from the merge with the master
2018-12-18 11:09:54 +05:30
e3e80dde1e
#305 & #298
2018-12-14 17:36:49 +05:30
b298a3973a
validation in shipping & payment methods and issue #308 & #295
2018-12-14 15:26:01 +05:30
9a699a64e5
Modified config creation
2018-12-14 15:02:59 +05:30
8cd04be89c
shipping & payment methods
2018-12-14 11:56:52 +05:30
d9f0ddc89d
Fixed issues 314 and 315
2018-12-13 18:51:54 +05:30
0bdd9e1a2a
Refactor Menu system and core config data system
2018-12-13 16:28:28 +05:30
1e05840c7d
Regular merge with master
2018-12-07 15:44:03 +05:30
45903d3c0a
Mass selection features refactored with a new type of configuration with dynamic routes and implemented mass selection features in reviews, products, currencies and attributes
2018-12-07 14:45:31 +05:30
3515adeb03
Refactor core config system
2018-12-07 12:35:34 +05:30
b78cc23797
shipping methods #204 popup confirmation for address delete #228 bagisto icon clickable #183 currency rate display & #128 calender clickable
2018-12-07 10:55:33 +05:30
4201a1ec48
export completed
2018-12-04 11:52:01 +05:30
bd1489dac6
export
2018-12-04 10:07:57 +05:30
27f5e1d93d
export
2018-12-04 09:53:52 +05:30
40f37cddd4
customer group add and delete fixes
2018-12-03 18:58:57 +05:30
5d42bebbf1
Customer group delete bug fix
2018-12-03 18:50:20 +05:30
48bece3531
datagrid routes are dynamic for all the action types and mass actions also only two type of mass actions are used as of now single button type and select box type for updating boolean columns or may be incement or decrement in the numeric type columns, while there had a new icon for the orders, invoices and shipments datagrid and minor style bug fix on sales index screens, confirm text is not mandatory when clicking on actions now it can be disabled by commenting on the confirm_text in datagrid configurations, mass actions are also route dependent and can be enabled or disabled on specific grids also.
2018-12-03 13:41:35 +05:30
552bf4b1f9
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
2018-11-30 20:38:15 +05:30
7fb67dc161
mass operations and datagrid operations normalization
2018-11-30 20:37:41 +05:30
4e8081ed58
Issue #247 (Displaying wrong number of products and sales in category, on dashboard)
2018-11-30 12:15:10 +05:30
984ff18267
merge with master
2018-11-29 18:13:45 +05:30
bb310cd5c7
route change
2018-11-29 18:07:58 +05:30
5f81a79796
Subscription newsletter migration restored and subsctiption newsletter datagrid in admin
2018-11-29 18:05:56 +05:30
e1b2d1eb01
export for customer
2018-11-29 17:39:39 +05:30
41aae38b14
view all & customer name
2018-11-29 12:12:44 +05:30
c8acd1823d
Merge pull request #205 from bagisto/prashant
...
migration fixes for product grid and fixes in slider data grid and ta…
2018-11-28 16:15:31 +05:30
217c94d76b
migration fixes for product grid and fixes in slider data grid and tax categories datagrid
2018-11-28 16:10:48 +05:30
230acb8b32
Issue #188 fixed (Customer group delete issue)
2018-11-28 12:41:17 +05:30
a9ef1269c3
Dashboard progress issues fixed
2018-11-27 10:53:47 +05:30
fb0079bf42
Fixed validation error messages
2018-11-27 10:16:35 +05:30
662ff09a24
Bug Fixes
2018-11-21 11:59:18 +05:30
b182325772
Customer address form issues fixed, invoice print feature addred
2018-11-01 19:18:59 +05:30
13e56c1930
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
2018-10-30 11:59:48 +05:30
97c7ca84c6
Dashboard issue fixed
2018-10-30 11:58:15 +05:30
2514d748b5
Slider Content Bug Fixed
2018-10-28 18:53:20 +05:30
7a157ee17d
Slider Backend Fixed
2018-10-28 16:30:15 +05:30
d9f4f73a58
conflict
2018-10-26 12:53:37 +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
0f6bcfde49
Seeders added
2018-10-25 11:01:47 +05:30
de0ea34e8a
conflict resolve
2018-10-23 17:24:27 +05:30
2c32f510b2
merged with master
2018-10-23 17:19:13 +05:30
56e8597c6f
Merge pull request #68 from bagisto/jitendra
...
Dashboard completed
2018-10-23 17:16:22 +05:30
96b40bf2c3
Products DataGrid
2018-10-23 17:16:00 +05:30
13ae5d58c0
Dashboard completed
2018-10-23 17:15:44 +05:30
5016e03b1c
Products datagrid mechanism is normailized to single table due to greate overhead in fetching total attributes for products.
2018-10-22 18:48:46 +05:30
399ba55982
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
2018-10-22 11:18:29 +05:30
5dc60d0fe1
customer group
2018-10-22 11:17:42 +05:30
6c0dfa6a96
Merge pull request #65 from bagisto/jitendra
...
Front currency switcher, currency edit page and locale edit page added
2018-10-18 13:49:45 +05:30
12d68fcb57
Front currency switcher, currency edit page and locale edit page added
2018-10-18 13:49:03 +05:30
bd752c7e3e
conflict
2018-10-18 12:55:00 +05:30
14140d647a
Merge pull request #64 from bagisto/jitendra
...
user on 404 page fixed
2018-10-18 11:55:13 +05:30
258262935a
user on 404 page fixed
2018-10-18 11:54:36 +05:30
b5be4cf320
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
2018-10-18 10:33:45 +05:30
dde2a626e6
laoder changes
2018-10-18 10:33:00 +05:30
3a1029290f
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
2018-10-17 19:50:55 +05:30
8c7626b2b2
before merge
2018-10-17 19:50:25 +05:30
b02d87626a
Get current channel code updated
2018-10-17 19:27:51 +05:30
84bc6c0c60
merged
2018-10-17 16:17:46 +05:30
9756480f42
Theme issue fixed
2018-10-17 16:17:03 +05:30
11e7db8f85
Before merge with masteer
2018-10-17 16:03:57 +05:30
b0a12d85a3
COnflict resloved
2018-10-17 16:03:25 +05:30
faab00c3b8
Bug fixed
2018-10-17 16:00:31 +05:30
b329567370
conflict
2018-10-17 15:14:22 +05:30
8009b5c647
error & loader
2018-10-17 13:10:08 +05:30
d3b73f517c
Sales email templates added
2018-10-17 12:51:47 +05:30
ec03cbd63e
conflict resolve
2018-10-15 16:16:50 +05:30
7f1675e37c
Order cancel implemented
2018-10-15 16:09:09 +05:30
5cc562d972
reviews
2018-10-15 14:32:26 +05:30
ba2ad4bd28
customer fixes
2018-10-15 10:22:00 +05:30
1e16931ba3
Countries and States models added
2018-10-12 18:24:10 +05:30
f28f716d9f
Bug fixes across the system
2018-10-11 19:55:59 +05:30
d00bb078a1
Shipment and invoice creation completed
2018-10-09 17:32:22 +05:30
ac39fca00e
responsive
2018-09-22 15:42:23 +05:30
335f27e1f6
review issues
2018-09-21 19:13:41 +05:30
b082d73707
customer edit/add & show in admin
2018-09-11 09:41:48 +05:30
d0e0b64445
merge conflict
2018-09-08 14:22:46 +05:30
149c98ff03
customer & review
2018-09-08 14:11:36 +05:30
4cf6ab5f00
Tax Module Completed with just edit form left.
2018-09-04 14:44:32 +05:30
df199f0728
Taxes, long intended routes, ACL now prevents login if user already logged in.
2018-08-31 11:33:11 +05:30
23653a7922
conflict resolve
2018-08-30 18:05:43 +05:30
86b7971b61
Customer Profile issues fixed
2018-08-22 12:57:41 +05:30
36a05a4bcd
Customer routes now tranferred in master route table for packages, removed display bug from navigation menu and removed the item from the root parent of navigation menu in storefront
2018-08-22 10:41:48 +05:30
eaf721f062
merging with master
2018-08-21 16:35:43 +05:30
7e95b89ec8
For demo
2018-08-21 16:28:55 +05:30
21a16b8cf0
Refactored the code for datagrid from view composers to selft dependent injection classes and storefront views directory structure is segregated.
2018-08-16 11:35:45 +05:30
73d044a4f9
Sliders grid now joined with channels
2018-08-09 10:05:32 +05:30
8406da969d
Slider layers now working, datagrid on slider working
2018-08-08 19:17:40 +05:30
3fa134ca16
Datagrid Integration in Settings done.
2018-08-08 15:07:04 +05:30
2c90d713af
Datagrid working without dots in the URL, next is to put the validation for valid aliasing if aliasing is used and set true
2018-08-08 11:03:23 +05:30
7ddcba62f9
Datagrid fallback to new URL format
2018-08-07 18:57:59 +05:30
6b54f4d526
pagination working, non aliasing bugs removed, datagrid working good
2018-08-06 19:51:11 +05:30
2f3b0179d6
Non aliased case bug removed
2018-08-06 17:11:20 +05:30
ce1a3ebad6
Bug fixes and UI touchups in DataGrid
2018-08-06 15:21:24 +05:30
jitendra
Prashant Singh
Jitendra Singh
rahul shukla
Prashant Singh
imanghafoori