Prashant Singh
|
42d067c44a
|
Optimization in exception handling for separate admin and shop providers, whilst convertxtoproductid is in UI development
|
2019-07-14 07:30:16 +05:30 |
|
Prashant Singh
|
5f08f2b9f4
|
Fixed sort order for configuration in admin panel
|
2019-07-14 00:46:33 +05:30 |
|
Prashant Singh
|
f8c774b3a5
|
Started with convert x to product id for cart rules
|
2019-07-13 15:23:27 +05:30 |
|
Prashant Singh
|
88611c9d84
|
Fixed issue #1172
|
2019-07-11 09:49:32 +05:30 |
|
Prashant Singh
|
abd3913d45
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-07-10 10:37:29 +05:30 |
rahul shukla
|
cc4dfcad76
|
issue #1160, filterable attribute & configuration updated for validation
|
2019-07-09 14:47:40 +05:30 |
|
Prashant Singh
|
316ec39aaf
|
Configuration field changes done, data-vv-as parameter now take translated attribute from field configuration key called title
|
2019-07-09 11:18:02 +05:30 |
|
Prashant Singh
|
869265e7a5
|
Fixed the bug is system core configuration preventing to take null values inn the select and multi select fields
|
2019-07-09 10:11:19 +05:30 |
|
rahul shukla
|
746a17dcf6
|
conflict resolve
|
2019-07-08 13:13:34 +05:30 |
|
rahul shukla
|
c7add7e2fe
|
removal of excess code in search, locale & currency
|
2019-07-08 13:10:41 +05:30 |
Jitendra Singh
|
2c45ddee13
|
Merge pull request #1157 from danielpinon/patch-1
Updating translations of languages in pt_BR
|
2019-07-08 12:13:54 +05:30 |
Daniel Pinon
|
723f6ad639
|
Clearing duplicity
|
2019-07-06 23:59:59 -03:00 |
|
Daniel Pinon
|
c5fe78014c
|
Updating translations of languages in pt_BR
|
2019-07-06 23:58:01 -03:00 |
|
Prashant Singh
|
c8e8df1699
|
Added configuration for cart rules
|
2019-07-06 17:41:58 +05:30 |
|
rahul shukla
|
54481ebbfe
|
slider edit issue
|
2019-07-05 18:15:22 +05:30 |
|
Prashant Singh
|
3fe220428c
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-07-05 13:23:56 +05:30 |
|
rahul shukla
|
60435b724f
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-07-04 12:38:36 +05:30 |
|
rahul shukla
|
c56d94f7a4
|
issue #968 and dependent field
|
2019-07-04 12:38:20 +05:30 |
|
Prashant Singh
|
f8d38e9bbd
|
Enabled usage parameters of cart rule in create and edit form
|
2019-07-03 11:37:09 +05:30 |
|
Prashant Singh
|
12c321e80e
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-07-02 12:45:59 +05:30 |
|
Prashant Singh
|
bfe52a7d3c
|
Enabling coupon usage option for cart rules and start of the program convertxtoproductid
|
2019-07-02 12:45:30 +05:30 |
|
rahul shukla
|
2f905203a2
|
style for dashboard
|
2019-06-29 18:12:07 +05:30 |
|
rahul shukla
|
b8c0f4aed6
|
css changes for overflow
|
2019-06-29 15:26:26 +05:30 |
|
rahul shukla
|
34fd4e3840
|
assets compile for production
|
2019-06-28 17:11:26 +05:30 |
|
rahul shukla
|
beabada35e
|
acl added for cart rule & dashboard css changes
|
2019-06-28 16:30:36 +05:30 |
|
Prashant Singh
|
8a5d57bcc6
|
new compiled assets for production
|
2019-06-28 16:30:36 +05:30 |
|
Prashant Singh
|
fce7ec8586
|
Assets compiled for production and updated the changelog for new release v0.1.6
|
2019-06-28 16:29:41 +05:30 |
|
Prashant Singh
|
25007824eb
|
Shipping now getting applied according to selected shipping method
|
2019-06-27 19:51:17 +05:30 |
|
Jitendra Singh
|
4feeffaf51
|
Merge pull request #1124 from prashant-webkul/development
Fixed issue #1080
|
2019-06-27 16:18:13 +05:30 |
|
Prashant Singh
|
9b83fb8025
|
Fixed issue #1080
|
2019-06-27 16:14:24 +05:30 |
|
Jitendra Singh
|
9eaf46a4d1
|
Merge pull request #1123 from prashant-webkul/development
Product export now added
|
2019-06-27 14:59:42 +05:30 |
|
Prashant Singh
|
487484f86d
|
Product export now added
|
2019-06-27 14:55:32 +05:30 |
|
Jitendra Singh
|
4627c6a519
|
Merge pull request #1122 from prashant-webkul/development
Development
|
2019-06-27 14:43:51 +05:30 |
|
Prashant Singh
|
c245eab856
|
Fixed issue #1086 for customer edit
|
2019-06-27 14:41:01 +05:30 |
|
rahul shukla
|
79b5e1c4cd
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-06-27 14:38:48 +05:30 |
|
rahul shukla
|
a9090e991c
|
download for image & file type
|
2019-06-27 14:38:24 +05:30 |
|
Prashant Singh
|
d1395ba145
|
Fixed issue #1086
|
2019-06-27 14:24:26 +05:30 |
|
Prashant Singh
|
3f79f2b89a
|
Fixed issue #1114, #1112
|
2019-06-27 13:30:45 +05:30 |
jitendra
|
2a5e8b1ddd
|
Removed propaganistas/laravel-intl dependency
|
2019-06-27 13:01:47 +05:30 |
|
rahul shukla
|
62cb90e014
|
status for customer
|
2019-06-26 18:02:14 +05:30 |
|
Jitendra Singh
|
a60e339218
|
Merge pull request #1105 from prashant-webkul/development
Development
|
2019-06-25 15:02:46 +05:30 |
|
Prashant Singh
|
68c22f38f6
|
improvements in cart rules
|
2019-06-25 14:44:14 +05:30 |
|
Prashant Singh
|
1a262e0f27
|
Fixed some bugs in cart rules
|
2019-06-25 12:27:13 +05:30 |
|
Prashant Singh
|
eedc0c6153
|
eliminated the column is_guest column from cart rules in favor of guest as a customer group
|
2019-06-25 11:10:21 +05:30 |
|
Jitendra Singh
|
d547ab5058
|
Merge pull request #1090 from prashant-webkul/development
Development
|
2019-06-21 16:28:59 +05:30 |
|
rahul shukla
|
9080f1e278
|
removed inline css
|
2019-06-21 11:37:31 +05:30 |
|
rahul shukla
|
b0c35ead9f
|
icon issue in admin dashboard
|
2019-06-21 11:23:27 +05:30 |
|
Prashant Singh
|
8c9fb32ab1
|
Removed some deadcode of productgrid repository which is no longer needed and had been obselete from many days
|
2019-06-21 04:15:45 +05:30 |
|
Prashant Singh
|
937d91ea5b
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-06-20 18:10:07 +05:30 |
|
rahul shukla
|
048585853d
|
repository insted of model in attribute create & edit for locale
|
2019-06-20 15:12:28 +05:30 |
|
Jitendra Singh
|
bfac46ffdf
|
Merge pull request #1079 from rahulshukla-webkul/development
issue of discount amount in order #1053
|
2019-06-20 14:34:11 +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 |
|
rahul shukla
|
f72529f0fb
|
issue of discount amount in order #1053
|
2019-06-20 12:17:11 +05:30 |
|
Prashant Singh
|
acad17af67
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-06-19 18:21:26 +05:30 |
|
Prashant Singh
|
052afb4faf
|
Fixed issues with apply to shipping and free shipping in create and edit of cart rules
|
2019-06-19 18:18:21 +05:30 |
|
Prashant Singh
|
423824b531
|
Fixed issue #1075 and #1074
|
2019-06-19 18:13:41 +05:30 |
|
rahul shukla
|
5b98b9a86d
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-06-19 16:32:48 +05:30 |
|
rahul shukla
|
be8c11aa98
|
issue #1069
|
2019-06-19 16:32:38 +05:30 |
|
Prashant Singh
|
de445279d2
|
Fixed bug in product creation changed the name of product type configuration file and implemented new design for condition fields in create and edit pages of cart rules
|
2019-06-19 16:27:32 +05:30 |
|
Prashant Singh
|
68e0ba1ac1
|
Fixed issue #1054
|
2019-06-19 10:58:02 +05:30 |
|
rahul shukla
|
d25cc60351
|
issues #1056 & 1058
|
2019-06-18 18:05:52 +05:30 |
|
rahul shukla
|
9166daa31b
|
issues #1056 & 1058
|
2019-06-18 17:58:34 +05:30 |
|
rahul shukla
|
1144ce7e10
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-06-17 18:32:12 +05:30 |
|
rahul shukla
|
94b67d00c1
|
admin css changes
|
2019-06-17 18:31:52 +05:30 |
|
rahul shukla
|
0b5f50f1b0
|
depandent field added in configuaration
|
2019-06-17 18:22:23 +05:30 |
|
Prashant Singh
|
d18667351c
|
Base sync
|
2019-06-17 12:38:29 +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 |
|
Prashant Singh
|
ba31ecd527
|
Cart rule create and edit forms bug fixes
|
2019-06-16 22:18:19 +05:30 |
|
Prashant Singh
|
15abe379e0
|
Changed frontend attributes and syntax fixes in checkout
|
2019-06-16 17:26:06 +05:30 |
|
jitendra
|
a2d1e1aa85
|
Column 'code' added in customer_groups table
|
2019-06-15 18:50:38 +05:30 |
|
Prashant Singh
|
9ae4f8a801
|
Fixed issues with cart rule customer groups
|
2019-06-15 18:47:53 +05:30 |
|
Jitendra Singh
|
545cd7386e
|
Revert "Revert "Fixed issue with order summary rendering on cart page""
|
2019-06-15 16:49:02 +05:30 |
|
Jitendra Singh
|
65f899dcfe
|
Merge pull request #1038 from jitendra-webkul/jitendra
Guest removed from customer pages
|
2019-06-15 16:35:42 +05:30 |
|
jitendra
|
ff64d23319
|
Guest removed from customer pages
|
2019-06-15 16:34:56 +05:30 |
|
Jitendra Singh
|
7ac715e93d
|
Revert "Fixed issue with order summary rendering on cart page"
|
2019-06-15 15:09:59 +05:30 |
|
Prashant Singh
|
0927786cee
|
Fixed issue with order summary rendering on cart page
|
2019-06-15 14:56:24 +05:30 |
|
Prashant Singh
|
1e865986c4
|
improved conditions check in applying cart rules
|
2019-06-14 19:24:15 +05:30 |
|
rahul shukla
|
c8fb37698c
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-06-14 14:22:50 +05:30 |
|
rahul shukla
|
0bdd03b331
|
ticket 201 error & admin css for back icon
|
2019-06-14 14:22:22 +05:30 |
|
Prashant Singh
|
4bfefd3a07
|
base sync
|
2019-06-14 13:22:37 +05:30 |
|
Prashant Singh
|
c52238e45e
|
Cart rule frontend normalization
|
2019-06-14 13:21:17 +05:30 |
|
Prashant Singh
|
7f9409bd8e
|
Checkout and cart page now coupled with cart rules
|
2019-06-14 12:10:03 +05:30 |
|
rahul shukla
|
5afef79ac2
|
merge with master
|
2019-06-13 20:24:52 +05:30 |
|
jitendra
|
6e8c0da054
|
Fixed conflicts
|
2019-06-13 19:48:30 +05:30 |
|
jitendra
|
806f8f71f6
|
Added discount amount to cart item
|
2019-06-13 19:34:13 +05:30 |
|
Prashant Singh
|
a27bae1c2d
|
All assets compiled for production
|
2019-06-13 19:08:42 +05:30 |
|
Prashant Singh
|
769f17a196
|
Fixed some syntax issue in cart rule controller
|
2019-06-13 19:00:33 +05:30 |
|
Prashant Singh
|
0aaf3d68e1
|
Ui package assets compiled for production
|
2019-06-13 18:20:09 +05:30 |
|
rahul shukla
|
0fc78c5d83
|
Merge branch 'development' of https://github.com/rahulshukla-webkul/bagisto into development
|
2019-06-13 14:51:24 +05:30 |
|
Prashant Singh
|
d2e8e822d7
|
Fixed issue #1007
|
2019-06-13 12:51:18 +05:30 |
|
Prashant Singh
|
6c0ee913ed
|
added mass actions in admin customers grid
|
2019-06-13 12:47:58 +05:30 |
|
Prashant Singh
|
ec27ed4c8d
|
added credit max in configuration
|
2019-06-13 01:05:29 +05:30 |
|
Prashant Singh
|
76e43dcd58
|
added isset checks on admin dashboard causing some rendering issue while there was nothing to be evaluated
|
2019-06-12 01:05:24 +05:30 |
|
rahul shukla
|
6a8c7a8784
|
assests compile for production
|
2019-06-11 16:40:13 +05:30 |
|
rahul shukla
|
5b1f300abf
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-06-11 16:22:15 +05:30 |
|
Prashant Singh
|
22a81efdb3
|
fixed issue #1011
|
2019-06-11 14:51:28 +05:30 |
|
Prashant Singh
|
6b9be23cb0
|
fixed issue in cart rule for add condition button and exception while updating cart rule
|
2019-06-11 14:38:57 +05:30 |
|
Prashant Singh
|
de126e38ed
|
fixed issue with cart rule disc_quantity as validation was allowing zero at the time of creation
|
2019-06-11 12:32:34 +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 |