Prashant Singh
794aac2c8e
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-28 16:57:17 +05:30
Prashant Singh
ba8fb649e7
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-28 16:33:08 +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
rahul shukla
0088bf7709
check in phone column unique removal
2019-06-28 15:44:17 +05:30
rahul shukla
7c8dc15c58
check in phone column unique removal
2019-06-28 15:43:53 +05:30
rahul shukla
fdb9252b2a
check for phone column & verrion last digit check in installer
2019-06-28 15:18:48 +05:30
Prashant Singh
c4ec5853e2
Fixed conditions issue
2019-06-28 15:13:57 +05:30
Prashant Singh
5174c02bb0
Problem with does not contains condition is not fixed
2019-06-28 14:49:37 +05:30
Prashant Singh
35b8af8d47
Non argument fix for reset shipping
2019-06-28 13:29:39 +05:30
Prashant Singh
a304795c36
Fixed issues with buy atleast
2019-06-28 12:59:40 +05:30
Prashant Singh
e8dd4219a7
Apply on shipping working on cart rule
2019-06-28 12:57:19 +05:30
Prashant Singh
02faaf7415
Added reset shipping when applying coupon cart rule
2019-06-28 11:30:01 +05:30
Prashant Singh
e4612d8629
Fixed some discrepancies in apply to shipping in cart rules
2019-06-28 10:56:44 +05:30
Prashant Singh
4339475e70
CheckOnShipping method added to check where rule applies on shipping or not
2019-06-27 19:55:36 +05:30
Prashant Singh
25007824eb
Shipping now getting applied according to selected shipping method
2019-06-27 19:51:17 +05:30
Prashant Singh
4db41973fd
Removed the option of BuyAGetB as its current functionality was same as Fixed amount
2019-06-27 18:34:37 +05:30
Prashant Singh
216b409531
Apply to shipping and free shipping now added in normal flow
2019-06-27 17:09:56 +05:30
Prashant Singh
ec0277d3fb
Some improvements in super admin panels for SAASModule
2019-06-27 16:58:57 +05:30
Prashant Singh
e17da6fdfa
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-27 16:41:46 +05:30
Prashant Singh
5135ef5f34
Optimized validates discount class as it was creating redundancy with discount class
2019-06-27 16:40:57 +05:30
Jitendra Singh
5bf6f30f4a
Merge pull request #1125 from prashant-webkul/development
...
Fixed issue with cart rule validation when placing order
2019-06-27 16:28:36 +05:30
Prashant Singh
db12a1587f
Fixed issue with cart rule validation when placing order
2019-06-27 16:27:06 +05:30
Prashant Singh
af100ac04e
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-27 16:20:29 +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
Prashant Singh
3e86f81681
Base sync with core master
2019-06-27 15:05:13 +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
Prashant Singh
bebf5e105b
Base sync with github master
2019-06-27 13:11:48 +05:30
Jitendra Singh
fd06d6dc26
Merge pull request #1117 from jitendra-webkul/jitendra
...
Removed propaganistas/laravel-intl dependency
2019-06-27 13:03:12 +05:30
jitendra
2a5e8b1ddd
Removed propaganistas/laravel-intl dependency
2019-06-27 13:01:47 +05:30
Jitendra Singh
367f1771a8
Merge pull request #1116 from prashant-webkul/development
...
Added remove logic in coupon rule class
2019-06-27 13:00:04 +05:30
Prashant Singh
5073226872
Added remove logic in coupon rule class
2019-06-27 12:58:41 +05:30
Jitendra Singh
e45fee03c6
Merge pull request #1115 from prashant-webkul/development
...
Cart rule guest issues and discount price not visible in cart summary…
2019-06-27 12:58:07 +05:30
Prashant Singh
64a6f06357
Cart rule guest issues and discount price not visible in cart summary is now fixed
2019-06-27 12:56:31 +05:30
Jitendra Singh
0102dd0c30
Merge pull request #1111 from prashant-webkul/development
...
Development
2019-06-27 11:45:23 +05:30
Prashant Singh
790bc2d7a4
Added the extra note on summary for stripe fees when customer is selected to pay stripe fees as transaction fees
2019-06-27 05:05:56 +05:30
Prashant Singh
9ba162e7a0
Critical bug fix in super admin security
2019-06-27 04:43:45 +05:30
Prashant Singh
c539e017fe
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-27 04:38:41 +05:30
Prashant Singh
3e4d2603c4
Apply to shipping and free shipping now enabled and provided support for multi currency cart rule discount
2019-06-27 04:35:26 +05:30
Prashant Singh
8a37088b9f
Omitted the applicable rules that gives 0 value discounts
2019-06-27 02:25:44 +05:30
Prashant Singh
7e8ae8022b
Some conditions changed according to end_other_rules attribute
2019-06-27 02:18:47 +05:30
Prashant Singh
72cf1c0226
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-27 01:36:18 +05:30
Prashant Singh
6d40b54d1d
Remote sync
2019-06-27 01:36:11 +05:30
Prashant Singh
c783ffa966
Added more checks for noncouponable and couponable rule interfaces
2019-06-27 01:32:32 +05:30
rahul shukla
54fa3419f3
admin name for attribute
2019-06-26 21:03:52 +05:30
rahul shukla
62cb90e014
status for customer
2019-06-26 18:02:14 +05:30
Prashant Singh
73d9966a12
Fixed issue #1108
2019-06-26 16:42:53 +05:30
rahul shukla
9a92a61724
try & catch added in buynow
2019-06-26 16:40:15 +05:30
Prashant Singh
1573ae5261
Added product export feature, to be migrated in core framework
2019-06-26 14:39:24 +05:30
Prashant Singh
397d83e64f
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-26 14:36:54 +05:30
Jitendra Singh
fe14287b07
Merge pull request #1106 from prashant-webkul/development
...
Development
2019-06-26 14:33:29 +05:30
Prashant Singh
00ba0f2e71
Fixed issue with guest checkout when looking for cart rules based on guest customer groups
2019-06-26 14:30:32 +05:30
Prashant Singh
00bb4b0367
Preorder bug fixes
2019-06-25 17:08:52 +05:30
Prashant Singh
85ed096185
Fixes in customer document, removal of session from company facade
2019-06-25 16:56:57 +05:30
Prashant Singh
02be744066
Removed is_guest check from couponable and non couponable rules
2019-06-25 15:36:41 +05:30
Prashant Singh
ead9f2d465
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-25 15:04:41 +05:30
Jitendra Singh
a60e339218
Merge pull request #1105 from prashant-webkul/development
...
Development
2019-06-25 15:02:46 +05:30
Prashant Singh
af04acf76e
Fixes in preorder
2019-06-25 15:00:34 +05:30
Prashant Singh
ddb2f1b59f
Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development
2019-06-25 14:57:57 +05:30
Prashant Singh
ecd766cb81
Some changes in frontend regarding coupon form on checkout
2019-06-25 14:57:26 +05:30
Prashant Singh
68c22f38f6
improvements in cart rules
2019-06-25 14:44:14 +05:30
Jyoti Singh
44947074a4
added discount threshold check in fixed amount cart rule
2019-06-25 13:37:24 +05:30
Prashant Singh
35a87aa7fd
Added more security fixes for cart rules
2019-06-25 13:19:58 +05:30
Prashant Singh
463ff5a8ac
Fixed issues with cart rules and made a validation function that checks the applied rule for any changes made in cart
2019-06-25 13:14:12 +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
Prashant Singh
3382ffc076
Customer group catalog fixed
2019-06-24 19:23:20 +05:30
Prashant Singh
35c8402749
Store front files published according to new customer group categoru
2019-06-24 18:52:45 +05:30
Prashant Singh
cc649c83da
Fixed customer group category
2019-06-24 18:47:29 +05:30
Prashant Singh
a7d1c5e518
PreOrder fixes
2019-06-24 18:25:47 +05:30
rahul shukla
b0efd192e2
removed undefined variable rule from checkout/save payment
2019-06-24 18:03:31 +05:30
Prashant Singh
7fd8122251
Fixed issue with preorder
2019-06-24 17:10:33 +05:30
Prashant Singh
f825be085a
Customer document fixed
2019-06-24 17:06:14 +05:30
Prashant Singh
e79701b037
customer group catalog fixed
2019-06-24 16:06:46 +05:30
Prashant Singh
e130e79121
Fixed issue with preorder not showing button
2019-06-24 12:09:47 +05:30
Prashant Singh
714d9deed1
updated package of customer group catalog
2019-06-24 11:22:06 +05:30
Prashant Singh
df2e63a12a
Removed exception when seller ain't supporting stripe and added statement descriptor and who will pay service fees
2019-06-22 18:29:52 +05:30
Prashant Singh
bddb039ce6
Fixed a bug related to product review write in showprice after login
2019-06-22 17:06:16 +05:30
Prashant Singh
791dd64800
Preorder and show price after login integrated in shop views
2019-06-22 16:57:36 +05:30
Prashant Singh
7d023afa5b
conditions now more properly grouped for show price after login functionalities
2019-06-22 16:52:46 +05:30
Prashant Singh
14546dc12d
Show price after login permanently integrated into the system
2019-06-22 16:40:12 +05:30
Prashant Singh
3aa0135aec
changed shop blade files according to show price after login
2019-06-22 16:27:56 +05:30
Prashant Singh
e327ee2b05
reverted shop packages views
2019-06-22 15:18:10 +05:30
Prashant Singh
b11f5fe46f
Refactoring show price after login blade files
2019-06-22 15:01:20 +05:30
Prashant Singh
bce5997b11
Reverted blade files to original
2019-06-22 14:53:30 +05:30
Prashant Singh
c3bfcf5d79
Show price after login modified
2019-06-22 13:53:36 +05:30
Prashant Singh
1d988dd82a
Show price after login refactor
2019-06-22 13:18:22 +05:30
Prashant Singh
813bccf758
Totally fixed registration form
2019-06-22 13:04:13 +05:30
Prashant Singh
75f45b765c
More stripe settings added for seller
2019-06-22 12:30:50 +05:30
Prashant Singh
07858f5ef7
Registration form fixed
2019-06-22 12:03:54 +05:30
Prashant Singh
cf0f54cc7a
Registration form fixed with unique validations
2019-06-22 11:57:56 +05:30
Prashant Singh
0d2ed2bab4
Registration fixed
2019-06-22 11:03:33 +05:30
Prashant Singh
0fb24ce320
Preorder made compatible with SAAS module
2019-06-22 10:59:15 +05:30
Prashant Singh
6fd67e56d7
New repo with base sync
2019-06-22 01:02:33 +05:30
Jitendra Singh
754d99d3ba
Merge pull request #1094 from rahulshukla-webkul/development
...
issue #1015 pagination responsive
2019-06-21 16:29:08 +05:30
Jitendra Singh
d547ab5058
Merge pull request #1090 from prashant-webkul/development
...
Development
2019-06-21 16:28:59 +05:30
rahul shukla
7d2b751479
issue #1015 pagination responsive
2019-06-21 16:17:37 +05:30
rahul shukla
a35c997a56
issue #1014
2019-06-21 15:01:51 +05:30
rahul shukla
ba26a39f74
issue #951
2019-06-21 14:41:22 +05:30
rahul shukla
df57ef9f84
issue #1086
2019-06-21 12:05:37 +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
12846df91c
quantity issue in discount
2019-06-20 17:49:14 +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
Jitendra Singh
f1f7d03f6f
Merge pull request #1078 from rahulshukla-webkul/development
...
flash message for discount & error
2019-06-20 11:04:55 +05:30
rahul shukla
d76d8bd129
flash message for discount & error
2019-06-19 21:18:16 +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
144bda6590
review page render in onepage
2019-06-19 17:08:36 +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
Jitendra Singh
10e60dd4d7
Merge pull request #1071 from jitendra-webkul/jitendra
...
Fixed checkout summary refresh issue
2019-06-19 15:16:28 +05:30
jitendra
aa1a5451bd
Fixed checkout summary refresh issue
2019-06-19 15:15:27 +05:30
Prashant Singh
d1c0be06ae
Cart rule coupons sync bugs fixed
2019-06-19 14:57:13 +05:30
Prashant Singh
8e648af885
Fixed issue #1003
2019-06-19 14:52:30 +05:30
Prashant Singh
bf6a6109f4
Fixed issue #1057
2019-06-19 11:16:01 +05:30
Prashant Singh
68e0ba1ac1
Fixed issue #1054
2019-06-19 10:58:02 +05:30
Prashant Singh
e404465cc7
Fixed an issue when only one cart rule was getting applied it was also returning db instance of cart rule with it
2019-06-18 20:16:51 +05:30
Prashant Singh
c2320410ab
cart rule issue fix
2019-06-18 19:17:16 +05:30
Prashant Singh
be62623022
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-18 19:16:14 +05:30
Prashant Singh
e0f93aae56
Fixed issue in cart rule actions
2019-06-18 19:14:49 +05:30
Jitendra Singh
210be70779
Merge pull request #1049 from prashant-webkul/development
...
all calculations now changed to base price
2019-06-18 19:02:39 +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
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
3af3996439
buy now issue
2019-06-18 17:42:11 +05:30
Prashant Singh
bcdb4efb6c
Fixed a bug in application of cart rule
2019-06-17 18:48:54 +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
9c379f1ba4
Bug fix in cart rule
2019-06-17 16:22:18 +05:30
Prashant Singh
82d916c646
cart rule action percent of product changed to base price of item
2019-06-17 16:20:53 +05:30
Prashant Singh
d0c5589800
all calculations now changed to base price
2019-06-17 14:25:38 +05:30
Prashant Singh
4b99f5acf9
Summary template now re rendering on applying and removal of coupon
2019-06-17 14:16:51 +05:30
Prashant Singh
c2c0836b85
Couponable rule getting over ride by previously applied non-couponable rule
2019-06-17 13:09:21 +05:30
Prashant Singh
d18667351c
Base sync
2019-06-17 12:38:29 +05:30
Prashant Singh
b79e45ee7b
Clearing discount when applying or updating a new rule over current cart
2019-06-17 12:34:56 +05:30
Prashant Singh
f3437ee214
Fixed issues with discount as collect totals was not getting called on applying couponable rule
2019-06-17 12:33:34 +05:30
Prashant Singh
90c229442d
Fixed issues with testing criteria of cart rule conditions
2019-06-17 12:24:19 +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
b390d668f0
Added customer groups conditions in non couponable rules
2019-06-16 22:56:26 +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
b93bc11c65
Fixed js error in checkout page
2019-06-15 22:28:21 +05:30
jitendra
27b4ee19e5
Checkout coupon apply issue fixed
2019-06-15 22:22:40 +05:30
jitendra
ba240925a4
Added v-debounce directive
2019-06-15 19:51:10 +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
1f5d8a8f28
Revert "Revert "Development""
2019-06-15 16:50:37 +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
d4d9c3e5ee
Revert "Revert "Added Guest default customer group with id 0""
2019-06-15 16:48:29 +05:30
Jitendra Singh
1a15791f9d
Merge pull request #1039 from jitendra-webkul/jitendra
...
Reset changes
2019-06-15 16:47:36 +05:30
jitendra
e3946a79dd
Reset changes
2019-06-15 16:46:55 +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
c06bc39a7f
Merge pull request #1037 from bagisto/revert-1033-development
...
Revert "Fixed issue with order summary rendering on cart page"
2019-06-15 15:13:43 +05:30
Jitendra Singh
4427ec8205
Merge pull request #1036 from bagisto/revert-1028-jitendra
...
Revert "Added Guest default customer group with id 0"
2019-06-15 15:13:24 +05:30
Jitendra Singh
ea3a08a198
Merge pull request #1035 from bagisto/revert-1029-development
...
Revert "buy now issue"
2019-06-15 15:13:16 +05:30
Jitendra Singh
426cbe0ae5
Revert "Added Guest default customer group with id 0"
2019-06-15 15:10:11 +05:30
Jitendra Singh
fb5687c451
Revert "buy now issue"
2019-06-15 15:10:10 +05:30
Jitendra Singh
668f92185b
Revert "Development"
2019-06-15 15:10:04 +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
eaa755bbea
Fixed discount on frontend
2019-06-15 13:13:07 +05:30
Prashant Singh
8d68be8e07
Rule condition discount calculation now working properly
2019-06-15 12:27:54 +05:30
Prashant Singh
fc43b158dd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-15 10:49:04 +05:30
Prashant Singh
3a8b923f5c
Discount rule
2019-06-14 23:48:08 +05:30
rahul shukla
076f197de7
buy now issue
2019-06-14 21:04:22 +05:30
Prashant Singh
c36950c609
applied translation string in apply coupon responses
2019-06-14 20:26:54 +05:30
Prashant Singh
0188644fce
Prepared standard responses when applying couponable rules
2019-06-14 20:04:32 +05:30
Prashant Singh
bb097be557
Added error message provision in the same when coupon application fails
2019-06-14 19:58:25 +05:30
Prashant Singh
bec9ebe7fb
coupon section fix in review-order component
2019-06-14 19:52:58 +05:30
Prashant Singh
1e865986c4
improved conditions check in applying cart rules
2019-06-14 19:24:15 +05:30
Prashant Singh
da82f2935c
removed some dead code
2019-06-14 17:55:03 +05:30
jitendra
e26c2b4d89
Added Guest default customer group with id 0
2019-06-14 16:41:18 +05:30
jitendra
3f814d9253
Fixed checkout issue
2019-06-14 15:13:20 +05:30
Jitendra Singh
8fcca7363d
Merge pull request #1026 from jitendra-webkul/jitendra
...
Fixed checkout issue
2019-06-14 15:00:15 +05:30
jitendra
5b81968bae
Fixed checkout issue
2019-06-14 14:59:29 +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
Prashant Singh
e9a0588185
discount rule fixes
2019-06-13 22:19:44 +05:30
rahul shukla
5afef79ac2
merge with master
2019-06-13 20:24:52 +05:30
rahul shukla
1a36cd32c7
change query for min price of variant
2019-06-13 20:22:16 +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
abf46c8a99
Added discount amount in cart item table
2019-06-13 19:30:00 +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
7b14de69c6
changes in config & composer
2019-06-13 14:56:04 +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
23467d9389
Added message when seller is blocked
2019-06-13 06:37:16 +05:30
Prashant Singh
c86a699f69
Added status check in customer auth session creation function
2019-06-13 06:34:46 +05:30
Prashant Singh
619b8b6c8b
Added status and notes in customer model fillables
2019-06-13 06:28:29 +05:30
Prashant Singh
ec27ed4c8d
added credit max in configuration
2019-06-13 01:05:29 +05:30
Prashant Singh
4542c96b17
Fixed issue in core regarding buynow button passing static quantity as 1 is now removed
2019-06-12 15:16:06 +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
rahul shukla
1a84a016fa
bulk add to cart
2019-06-11 16:22:01 +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
Prashant Singh
a7592b233d
Fixed bug #1003
2019-06-11 12:26:54 +05:30
Prashant Singh
64c249983d
Fixed
2019-06-10 18:28:17 +05:30
Prashant Singh
8b5ac835e0
Fixed bugs in creation of cart rule form
2019-06-10 18:26:12 +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
e20e29b0bd
Fixed bug in cart rule form
2019-06-10 16:44:39 +05:30
Prashant Singh
451000c0d5
disabled customer groups from cart rules
2019-06-10 16:41:31 +05:30
Prashant Singh
0d3539f3c9
fixed validation issues in cart rule #993 & #997
2019-06-10 15:29:19 +05:30
Prashant Singh
cfb16da64a
fixed issue #994
2019-06-10 15:21:45 +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
66bd3e7989
Optional index for datagrid action
2019-06-07 17:59:38 +05:30
jitendra
5585b503cf
Car controller updated
2019-06-07 16:36:50 +05:30
jitendra
ca4d9ef9ba
Fixed js issue buy now button not exist
2019-06-07 15:42:58 +05:30
jitendra
c6a44b5414
Updated cart for custom_price
2019-06-07 11:18:46 +05:30
Jitendra Singh
87542306a2
Merge pull request #980 from rahulshukla-webkul/development
...
Development
2019-06-07 11:14:43 +05:30
rahul shukla
dc96dfb7b2
custom price default to null
2019-06-07 11:12:40 +05:30
rahul shukla
f924e7ed01
custom price nullable in cart items
2019-06-07 10:06:00 +05:30
Jitendra Singh
9bb3c2def9
Merge pull request #977 from rahulshukla-webkul/development
...
Development
2019-06-06 17:47:37 +05:30
Jitendra Singh
796e76564c
Merge pull request #974 from imanghafoori1/clean_up_config
...
clean up
2019-06-06 17:47:10 +05:30
imanghafoori
99ccac943d
fix bug
2019-06-06 16:25:06 +04:30
Jitendra Singh
d399811206
Merge pull request #978 from jitendra-webkul/jitendra
...
totalQuantity function added to product and product flat model
2019-06-06 16:44:31 +05:30
jitendra
2d00679901
totalQuantity function added to product and product flat model
2019-06-06 16:43:36 +05:30
rahul shukla
af67516c36
object added with event
2019-06-06 15:16:16 +05:30
rahul shukla
b7b42ffc15
translation updated
2019-06-04 18:25:54 +05:30
rahul shukla
255664c4c0
back button implemented on checkout page
2019-06-04 16:36:42 +05:30
imanghafoori
9f039cb9a5
clean up
...
- optimized imports
- remove unused variable
- extract a method
- flatten code
2019-06-04 14:45:16 +04:30
Jitendra Singh
68e01e85c2
Merge pull request #971 from imanghafoori1/clean_up_dashboard
...
Clean up
2019-06-04 14:21:19 +05:30
rahul shukla
d232722b5d
issue #916
2019-06-04 12:49:10 +05:30
rahul shukla
40e8c85813
issue #945 product image of variant
2019-06-04 10:17:00 +05:30
imanghafoori
e0dd74c06c
clean up
2019-06-04 00:52:37 +04:30
rahul shukla
93324e021e
issue #896 product special price
2019-06-03 17:11:11 +05:30
rahul shukla
fc456c785f
issue #850
2019-06-03 16:29:00 +05:30
Jitendra Singh
4ed068b00b
Merge pull request #967 from jitendra-webkul/jitendra
...
Fixed mini cart layout
2019-05-31 18:31:41 +05:30
jitendra
96e8556b54
Fixed mini cart layout
2019-05-31 18:30:09 +05:30
Jitendra Singh
fa87ecab3d
Merge pull request #966 from jitendra-webkul/jitendra
...
Issue #932 fixed
2019-05-31 17:54:26 +05:30
jitendra
8202f58284
Issue #932 fixed
2019-05-31 17:52:52 +05:30
Jitendra Singh
746d7e5204
Merge pull request #965 from rahulshukla-webkul/development
...
Development
2019-05-31 13:20:27 +05:30
rahul shukla
12e93b3f58
cart updated for convert price
2019-05-31 12:48:04 +05:30
jitendra
445b648b0a
Issues #948 , #949 fixed
2019-05-30 18:32:01 +05:30
Jitendra Singh
49d8388d49
Merge pull request #962 from rahulshukla-webkul/development
...
UI fixes for project
2019-05-30 13:25:59 +05:30
rahul shukla
3663391bf6
UI fixes for project
2019-05-30 11:52:06 +05:30
Jitendra Singh
219b9fae03
Merge pull request #960 from rahulshukla-webkul/development
...
channel added for payment & shiping method's status
2019-05-29 14:29:32 +05:30
rahul shukla
6804deae76
channel added for payment & shiping method's status
2019-05-29 13:31:53 +05:30
Jitendra Singh
ef2f9659f4
Merge pull request #959 from rahulshukla-webkul/development
...
configuration added to admin logo
2019-05-29 12:45:08 +05:30
rahul shukla
573df3818c
configuration added to admin logo
2019-05-29 12:42:18 +05:30
Jitendra Singh
3cec2d1935
Merge pull request #958 from rahulshukla-webkul/development
...
Development
2019-05-29 11:48:55 +05:30
rahul shukla
d1199a6f26
issue #956
2019-05-29 11:35:17 +05:30
rahul shukla
fe8ac5abf1
issue #957 change in event
2019-05-29 09:56:28 +05:30
Jitendra Singh
eee546da6a
Merge pull request #955 from rahulshukla-webkul/development
...
Development
2019-05-28 17:06:25 +05:30
rahul shukla
7281cfeb78
issue #922
2019-05-28 13:32:13 +05:30
rahul shukla
b5eff8b47e
issue #942
2019-05-27 18:25:30 +05:30
rahul shukla
c4a9d04e72
file & image attribute
2019-05-27 16:51:27 +05:30
jitendra
37ba923e9e
Backorder implemented
2019-05-24 18:45:47 +05:30
Jitendra Singh
d7c2ef3e6d
Merge pull request #944 from rahulshukla-webkul/development
...
Development
2019-05-24 17:18:17 +05:30
rahul shukla
b8561d4d5e
schema condition in product flat table
2019-05-24 12:15:30 +05:30
rahul shukla
308b3be1d8
installer file deletion after install
2019-05-24 11:53:11 +05:30
rahul shukla
7efcdefc6a
changes in prouduct flat new migration
2019-05-23 18:49:29 +05:30
jitendra
fb394d974c
Discount calculation added to the cart and discount added to the sales views
2019-05-23 18:44:16 +05:30
jitendra
edec481f26
Sales discount calculation implemented
2019-05-23 17:00:11 +05:30
rahul shukla
de5952bc36
issue #939
2019-05-23 13:06:31 +05:30
rahul shukla
8678a865f0
column added in product flat table
2019-05-23 12:10:02 +05:30
rahul shukla
2d85b90e81
weight unit added in configuration
2019-05-22 19:40:36 +05:30
rahul shukla
27812ccd15
shipping title & footer text
2019-05-22 18:45:47 +05:30
rahul shukla
5c6708c975
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-05-22 18:14:57 +05:30
rahul shukla
f434024827
change datatype of post code
2019-05-22 17:03:48 +05:30
shaiv-webkul
acfdd0f880
config field for password
2019-05-22 16:11:45 +05:30
Jitendra Singh
698f7da6da
Merge pull request #930 from rahulshukla-webkul/development
...
issue #917 & #923
2019-05-22 12:10:32 +05:30
rahul shukla
7888656d4c
down icon & product edit icon
2019-05-21 20:11:36 +05:30
rahul shukla
30942b3d25
product page changes
2019-05-21 19:36:20 +05:30
rahul shukla
84b60e9081
comment of phone field in customer
2019-05-21 18:07:54 +05:30
Jitendra Singh
d965e10e4b
Merge pull request #931 from jitendra-webkul/jitendra
...
Api added for address delete
2019-05-21 13:04:37 +05:30
jitendra
64fde804b4
Api added for address delete
2019-05-21 13:03:50 +05:30
rahul shukla
568e6ff7c8
change for group
2019-05-21 12:46:43 +05:30
rahul shukla
898214e81e
issue #925
2019-05-21 12:00:43 +05:30
rahul shukla
2d782cab79
issue #917 & #923
2019-05-21 10:51:39 +05:30
rahul shukla
f05d07eb38
issue #913 group in attribute family
2019-05-20 16:22:53 +05:30
jitendra
afb0b99723
Email sent option added in mail notification
2019-05-17 16:05:30 +05:30
jitendra
7931baab28
Email sent option added in mail notification
2019-05-17 15:31:39 +05:30
prateek srivastava
39ae415148
admin Navigation bar menu scroll issue fixed
2019-05-10 11:34:25 +05:30
Jitendra Singh
4455ce6849
Merge pull request #912 from jitendra-webkul/jitendra
...
Refactored ProductController
2019-05-09 16:50:45 +05:30
jitendra
165e6aef5b
Refactored ProductController
2019-05-09 16:49:52 +05:30
Jitendra Singh
05d3870b06
Merge pull request #911 from jitendra-webkul/jitendra
...
Added url_key to product api
2019-05-09 13:25:50 +05:30
jitendra
845a6c7f18
Added url_key to product api
2019-05-09 13:24:52 +05:30
Jitendra Singh
6e3769a95e
Merge pull request #910 from rahulshukla-webkul/development
...
icon issue in layred navigation #issue 903
2019-05-09 12:32:55 +05:30
rahul shukla
ce99a4d9bb
icon issue in layred navigation #issue 903
2019-05-09 12:28:48 +05:30
Jitendra Singh
2a4e6a619b
Merge pull request #909 from jitendra-webkul/jitendra
...
Api add to cart error message issue fixed
2019-05-09 12:05:18 +05:30
jitendra
a9a069f366
Api add to cart error message issue fixed
2019-05-09 12:04:41 +05:30
rahul shukla
d31179edaa
removal of space
2019-05-09 11:38:34 +05:30
rahul shukla
ae8a4dae61
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-05-09 11:36:51 +05:30
rahul shukla
4c2a895b08
Issue #897 & change in valdation message for category image
2019-05-09 11:36:21 +05:30
Jitendra Singh
55c083ae1e
Merge pull request #907 from jitendra-webkul/jitendra
...
Added api for forgot password
2019-05-08 18:57:25 +05:30
jitendra
16220c656f
Added api for forgot password
2019-05-08 18:56:28 +05:30
rahul shukla
3486983b1d
IE completed & redirect customer route
2019-05-08 17:52:54 +05:30
rahul shukla
6f494cc04b
IE changes
2019-05-07 21:09:27 +05:30
rahul shukla
e2120ea276
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-05-07 18:57:55 +05:30
rahul shukla
b52dc978e8
Admin section for IE & dyanamic footer content
2019-05-07 18:57:33 +05:30
jitendra
0ff492ae80
Fixed product repository search index issue
2019-05-07 17:54:43 +05:30
jitendra
a72d054cb5
Added api for front shop
2019-05-07 17:06:21 +05:30
rahul shukla
b4a95b8d0c
cart pages changes
2019-05-06 21:15:26 +05:30
rahul shukla
1b3653348d
front end changes for IE
2019-05-06 20:52:43 +05:30
rahul shukla
87b732898d
add & remove at cart page
2019-05-06 13:06:16 +05:30
Jitendra Singh
af8705d8e8
Merge pull request #900 from shenjiayu/development
...
utilise Mail::queue to send emails
2019-05-02 16:52:54 +05:30
jitendra
6b237b775d
Fixed payment class conflict
2019-05-02 11:00:02 +05:30
jitendra
6121e5eefe
Added getPaymentMethods in Payment
2019-05-02 10:55:59 +05:30
Jiayu Shen
2816dd01e5
Merge branch 'master' into development
2019-05-01 22:38:42 +10:00
Jitendra Singh
52bc554e31
Merge pull request #895 from prateek-webkul/development
...
admin mail notification, review price
2019-05-01 17:58:12 +05:30
shenjiayu
8eea13db2d
utilise Mail::queue to send emails
2019-05-01 21:31:03 +10:00
rahul shukla
f942415ebb
sort order for payment methods
2019-04-30 19:02:56 +05:30
rahul shukla
db56e4b2df
issue #814
2019-04-30 17:53:59 +05:30
rahul shukla
ca08b9a133
rtl css chages for category
2019-04-30 14:48:43 +05:30
rahul shukla
46da666ace
issue #767
2019-04-30 13:25:17 +05:30
prateek srivastava
4c101aa646
admin mail notification, review price
2019-04-30 12:55:11 +05:30
rahul shukla
507a41546d
issue #890
2019-04-30 12:40:35 +05:30
rahul shukla
f841f16621
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-29 15:51:30 +05:30
rahul shukla
cc3323c55d
issue #891 description issue
2019-04-29 15:51:15 +05:30
Jitendra Singh
a57c3e0ba7
Merge pull request #892 from jitendra-webkul/jitendra
...
price issue fixed
2019-04-29 15:42:13 +05:30
jitendra
5c68618416
price issue fixed
2019-04-29 15:41:31 +05:30
rahul shukla
8d64ba656a
option attribute in layred navigation & category changes
2019-04-26 19:06:18 +05:30
rahul shukla
2674fbb9ca
issue #850
2019-04-26 15:31:01 +05:30
rahul shukla
23431e5083
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-26 12:44:38 +05:30
Jitendra Singh
34aeeac2d0
Merge pull request #884 from jitendra-webkul/jitendra
...
Jitendra
2019-04-26 12:44:24 +05:30
jitendra
10e92dada3
Now variant's super attributes values are saving in product_flat table
2019-04-26 12:43:42 +05:30
rahul shukla
8019f49765
issue #879
2019-04-26 11:18:15 +05:30
rahul shukla
5e6131102b
issue #866 & #845
2019-04-25 14:11:49 +05:30
rahul shukla
deb209d140
confirm box on delete
2019-04-25 13:05:35 +05:30
rahul shukla
c09e000eb9
removal of view from customers service provider
2019-04-24 18:34:26 +05:30
rahul shukla
85af8e8402
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-24 17:57:30 +05:30
rahul shukla
75e74dfb7e
issue #867 shipment issue
2019-04-24 17:57:16 +05:30
jitendra
c4c55bc48d
Refactored cart class
2019-04-24 17:09:46 +05:30
Jitendra Singh
55e19c32c5
Merge pull request #873 from rahulshukla-webkul/development
...
issue #865 description
2019-04-24 16:26:37 +05:30
rahul shukla
fb15e48c4d
issue #865 description
2019-04-24 16:14:35 +05:30
Jitendra Singh
43a39dc77c
Merge pull request #872 from jitendra-webkul/jitendra
...
Fixed guard spell mistake
2019-04-24 16:06:19 +05:30
jitendra
28fc43fbfa
Fixed guard spell mistake
2019-04-24 16:05:29 +05:30
Jitendra Singh
723ecc88d9
Merge pull request #871 from jitendra-webkul/jitendra
...
Update Cart in order make compatible for api and session guard
2019-04-24 15:57:07 +05:30
jitendra
ee056ee917
Update Cart in order make compatible for api and session guard
2019-04-24 15:55:49 +05:30
Jitendra Singh
1f86376ffe
Merge pull request #870 from jitendra-webkul/jitendra
...
Configurable product add to cart issue fixed
2019-04-24 15:10:30 +05:30
jitendra
ac03710f07
Configurable product add to cart issue fixed
2019-04-24 15:09:55 +05:30
rahul shukla
8b0787ad53
issue #835
2019-04-24 14:45:57 +05:30
rahul shukla
423d3d1bbf
issues
2019-04-24 10:48:12 +05:30
rahul shukla
c4eb615328
issue #842
2019-04-23 18:53:41 +05:30
rahul shukla
e52c426600
dashboard & issue #841
2019-04-23 16:20:33 +05:30
rahul shukla
538c4beab0
merge with master
2019-04-23 15:40:06 +05:30
rahul shukla
9903d23dfe
change in category menu
2019-04-23 15:38:11 +05:30
jitendra
7a5c3f1bdc
Assets compiled for production
2019-04-23 12:58:47 +05:30
Jitendra Singh
64ee90f372
Merge pull request #860 from jitendra-webkul/jitendra
...
Created new route for 404 page
2019-04-23 12:44:37 +05:30
jitendra
b5c762b528
Created new route for 404 page
2019-04-23 12:43:42 +05:30
rahul shukla
148ff7c1e8
merge with master
2019-04-23 12:36:05 +05:30
Jitendra Singh
adfc375091
Merge pull request #859 from jitendra-webkul/jitendra
...
Issue #851 fixed
2019-04-23 11:17:25 +05:30
jitendra
9d65030779
Issue #851 fixed
2019-04-23 11:16:34 +05:30
Jitendra Singh
66b9cec73f
Merge pull request #858 from jitendra-webkul/jitendra
...
Issue #855 fixed
2019-04-23 11:03:48 +05:30
jitendra
e18fd4e5c4
Issue #855 fixed
2019-04-23 11:03:05 +05:30
Jitendra Singh
025a34d99f
Merge pull request #857 from jitendra-webkul/jitendra
...
Issue #840 fixed
2019-04-23 10:33:58 +05:30
jitendra
c585186a88
Issue #840 fixed
2019-04-23 10:33:10 +05:30
rahul shukla
560d1fb0bc
issue #856
2019-04-22 20:52:36 +05:30
rahul shukla
0239b7ec0b
issue #846
2019-04-18 20:22:37 +05:30
rahul shukla
148f942c4a
issue #848
2019-04-18 19:15:14 +05:30
rahul shukla
600bf55f1f
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-18 17:18:15 +05:30
Jitendra Singh
d2868f6316
Merge pull request #849 from jitendra-webkul/jitendra
...
Fixed urldecode issue in search temm
2019-04-18 17:17:55 +05:30
jitendra
f9e174ea70
Fixed urldecode issue in search temm
2019-04-18 17:16:36 +05:30
rahul shukla
26bd9f4283
issue #845
2019-04-18 17:16:07 +05:30
Jitendra Singh
7cd5bfe445
Merge pull request #847 from jitendra-webkul/jitendra
...
Issue #840 fixed
2019-04-18 15:51:53 +05:30
jitendra
7e826bef00
Issue #840 fixed
2019-04-18 15:50:03 +05:30
prateek srivastava
5b01493d26
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-18 13:04:10 +05:30
prateek srivastava
16b2b2a01f
scroller fixed
2019-04-18 12:58:35 +05:30
jitendra
580d3ddf65
Resolve conflict
2019-04-18 12:56:36 +05:30
jitendra
e99daf28e2
Issue #834 fixed
2019-04-18 12:52:51 +05:30
rahul shukla
439652699e
issue #836
2019-04-17 19:20:07 +05:30
rahul shukla
13ac4a9571
issue #824
2019-04-17 15:21:48 +05:30
rahul shukla
58ddc68520
issues
2019-04-17 12:56:33 +05:30
prateek srivastava
df8f54597a
scroller code removed
2019-04-17 12:30:50 +05:30
prateek srivastava
eb5bad16ff
removed code for scroller
2019-04-17 12:24:41 +05:30
rahul shukla
ad6acfa7e0
issue #824
2019-04-16 20:15:28 +05:30
rahul shukla
ae6d498f4c
merge with master
2019-04-16 19:22:49 +05:30
prateek srivastava
558b416bb6
Merge branch 'development' of https://github.com/prateek-webkul/bagisto into development
2019-04-16 19:22:03 +05:30
rahul shukla
3e97bacf91
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-16 19:19:26 +05:30
rahul shukla
095c045c58
change table of product datagrid to product_flat
2019-04-16 18:59:29 +05:30
jitendra
7fc68c56ae
Added product id attribute to model
2019-04-16 16:37:52 +05:30
jitendra
dd90e63ade
Fixed add to cart issue
2019-04-16 16:32:30 +05:30
jitendra
1dd23a5a39
Changed varaible name productFlat to product in product card page
2019-04-16 16:02:04 +05:30
rahul shukla
4e56374c70
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-16 16:01:37 +05:30
jitendra
700a2951e6
added related products and up sells to the product view page
2019-04-16 15:57:38 +05:30
rahul shukla
a4bb5a036b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-16 15:55:42 +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
rahul shukla
d568ea4bbe
merge with master
2019-04-16 15:35:54 +05:30
Prashant Singh
53ebbf5a1e
Removed product grid events, product grid table is now obselete and maybe used in future for someother purposes. In result we will have a faster product creation and a new grid will be added with product flat table
2019-04-16 14:47:28 +05:30
Prashant Singh
1aa9bf78aa
Removed unforced controller file from attribute package's Repositories directory
2019-04-16 14:41:12 +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
Prashant Singh
feaaaa89a5
fixed some style issues
2019-04-14 15:30:43 +05:30
Prashant Singh
f35e9a48d8
corrected composer.json provider path for UI package
2019-04-13 10:33:23 +05:30
Prashant Singh
520c21a4cd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-13 10:32:42 +05:30
rahul shukla
44c898824e
removed duplicate entry in product linking
2019-04-12 18:43:42 +05:30
Prashant Singh
3fe8152758
added php tooltip.js dependency and laravel dusk for browser tests profiling
2019-04-12 18:20:33 +05:30
rahul shukla
ee889cc259
upgrade code of zoom
2019-04-12 16:40:45 +05:30
rahul shukla
1caa3eb4f6
image zoom in rtl
2019-04-12 14:11:05 +05:30
rahul shukla
07b6ac6903
limit for up_sell, cross_sell & related product
2019-04-12 13:05:45 +05:30
rahul shukla
f1c263805c
issues #815
2019-04-10 16:45:52 +05:30
rahul shukla
2a859b7e23
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-10 15:08:15 +05:30
rahul shukla
b99b0ad8b5
product attribute & category menu
2019-04-10 15:08:01 +05:30
Jitendra Singh
ebc0befe6a
Merge pull request #813 from naresh-webkul/development
...
Development
2019-04-10 13:25:43 +05:30
rahul shukla
d1e38fe83b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-10 12:12:15 +05:30
jitendra
f3f61e3c91
Optimized performance
2019-04-10 12:10:46 +05:30
naresh verma
4f999ee34a
changed shipment table content
2019-04-09 19:40:43 +05:30
prateek srivastava
f2def6c4bc
scroller issue fixed
2019-04-09 19:28:44 +05:30
naresh verma
ab4c054292
changed shipment table
2019-04-09 18:52:44 +05:30
rahul shukla
b6a1a05e66
added permission of add & delete in acl
2019-04-09 18:52:03 +05:30
rahul shukla
e5d71fa280
change in jquery for wishlist icon for zoom
2019-04-09 17:59:58 +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
rahul shukla
5e15e05c78
tax category message change
2019-04-09 16:15:04 +05:30
Jitendra Singh
7678593bd4
Merge pull request #812 from rahulshukla-webkul/development
...
Development
2019-04-09 15:52:46 +05:30
rahul shukla
6a7f247d7a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-09 15:30:52 +05:30
jitendra
6b247993e4
Theme finder issue fixed (Shop changes was reflecting in admin)
2019-04-09 15:22:45 +05:30
rahul shukla
a3999d7a23
merge with master
2019-04-09 15:13:26 +05:30
rahul shukla
9d89ec816d
comment, variable name changes
2019-04-09 14:17:18 +05:30
rahul shukla
09aa34b36a
issue #749 fixed again & reduce query
2019-04-09 14:05:57 +05:30
Prashant Singh
1ec1c5d83c
fixed some bugs
2019-04-09 13:29:31 +05:30
Prashant Singh
1ca1ae5b61
Changed responses for all backend destroy functions and removed dead commented code
2019-04-09 13:17:19 +05:30
Prashant Singh
b3bf66c6e2
Base sync with master
2019-04-09 12:53:31 +05:30
Prashant Singh
75ef9cd530
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-09 12:50:09 +05:30
rahul shukla
8e7c3c7f22
restore migration
2019-04-09 12:12:35 +05:30
rahul shukla
dbde05e0cd
change in delete query
2019-04-09 12:05:52 +05:30
Prashant Singh
09d6afc72a
Implemented customer configuration based features:
...
1. Email Verification.
2. Email Subscription.
2019-04-09 08:03:31 +05:30
Prashant Singh
6c74b2ca42
admin assets compiled for production
2019-04-09 06:33:36 +05:30
Prashant Singh
6a4cb016c4
fixed issue #750
2019-04-09 06:31:52 +05:30
Prashant Singh
d8d645eb41
fixing csrf issue for datagrid delete
2019-04-08 20:26:04 +05:30
Prashant Singh
2df1a84191
Security fix underway need pull from other branches
2019-04-08 19:46:19 +05:30
rahul shukla
efd38ab99e
issue #718
2019-04-08 19:33:23 +05:30
rahul shukla
4bd89950ce
change update & delete query in controller & comment added
2019-04-08 16:48:43 +05:30
Prashant Singh
747f214739
fix in progress for get routes performing actions more than redirect
2019-04-08 04:51:02 +05:30
Prashant Singh
82e56334c2
Fixed modal style issues, localization of routes issue and updated description string of version command
2019-04-07 06:30:55 +05:30
Prashant Singh
c7482f576e
Some styles fixes on auth pages of customer and footer bottom
2019-04-07 03:44:18 +05:30
Prashant Singh
1033bd8d31
Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development
2019-04-06 02:23:12 +05:30
Prashant Singh
8cfcf3d484
order view for customer fixed
2019-04-06 02:18:31 +05:30
Prashant Singh
61fd02ed57
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-05 19:38:56 +05:30
Prashant Singh
1e6579bedf
in fix
2019-04-05 19:38:44 +05:30
rahul shukla
28c45c9bfa
issue #802
2019-04-05 19:29:04 +05:30
rahul shukla
91477e50c0
issue #802 sqllite
2019-04-05 19:19:10 +05:30
rahul shukla
ee189baf7a
merge with master
2019-04-05 16:55:09 +05:30
rahul shukla
fdb6284856
issue #760 wishlist
2019-04-05 16:54:09 +05:30
Prashant Singh
e88bf10c55
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-05 12:00:10 +05:30
jitendra
e83a27a31b
Issue #803 fixed
2019-04-05 11:42:52 +05:30
Jitendra Singh
89613136ff
Merge pull request #795 from imanghafoori1/flatten_code
...
flatten code
2019-04-05 11:10:49 +05:30
Prashant Singh
dadbf2bd6a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-05 10:47:16 +05:30
Prashant Singh
380f265ef1
H tag font sizes fix
2019-04-05 10:46:57 +05:30
imanghafoori
ca93e36826
flatten code
2019-04-04 23:53:59 +04:30
imanghafoori
07806c44fc
flatten code
2019-04-04 23:51:33 +04:30
rahul shukla
4c2a0a08fc
email subscription & newsletter verifiaction
2019-04-04 19:34:01 +05:30
rahul shukla
7be61550a4
change in query for muliselect attribute & layered navigation
2019-04-04 19:11:32 +05:30
rahul shukla
e0ab120b9b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-04 15:44:17 +05:30
rahul shukla
9c8f4f9522
issue #799 multiselect attribute & layered navigation
2019-04-04 15:43:33 +05:30
Prashant Singh
5c94a8a21f
changed name of folder from 'sass' to 'scss' inside packages Admin, Shop & Ui
2019-04-04 14:50:59 +05:30
Jitendra Singh
d18b862f85
Merge pull request #796 from imanghafoori1/fix_docblocks
...
fix docblocks
2019-04-04 12:07:55 +05:30
Jitendra Singh
8ac9c7b8ba
Merge pull request #793 from prateek-webkul/development
...
issue fixed #791
2019-04-04 11:56:34 +05:30
imanghafoori
56933912eb
fix docblocks
2019-04-03 18:13:59 +03:30
imanghafoori
2daf56c4fd
refactor using ::class
2019-04-03 17:24:45 +03:30
prateek srivastava
504a5ec038
issue fixed #791
2019-04-03 18:03:11 +05:30
prateek srivastava
1cb03f9ac3
admin scroller bug fixed
2019-04-03 15:23:12 +05:30
Jitendra Singh
3dee0678f7
Merge pull request #788 from imanghafoori1/flatten_foreach
...
flatten code
2019-04-03 14:49:22 +05:30
Jitendra Singh
d0e5e6a88f
Merge pull request #786 from imanghafoori1/flatten_code
...
Flatten code
2019-04-03 14:49:06 +05:30
Iman
759782c735
fix doc blocks ( #787 )
2019-04-03 12:34:35 +05:30
rahulshukla-webkul
23bb48e759
Development ( #790 )
...
* issue #753 swatch issue
* edit validation for swatch
* #783 product image with installer
* issue #773
* removal of view composers in shop
* issue #785 product name display
* merge with master & assests compile
2019-04-03 12:17:47 +05:30
prateek srivastava
b655a848d7
admin scroller bug fixed
2019-04-03 12:17:23 +05:30
rahulshukla-webkul
9314d9159c
Development ( #789 )
...
* issue #753 swatch issue
* edit validation for swatch
* #783 product image with installer
* issue #773
* removal of view composers in shop
2019-04-03 11:37:48 +05:30
imanghafoori
fadd26bd13
flatten code
2019-04-02 22:10:34 +03:30
imanghafoori
14cd4eb97e
flatten code
2019-04-02 21:50:44 +03:30
Prateek Srivastava
f2e4930e8e
admin nav left menu scroll bug fixed ( #784 )
...
* admin nav left menu scroll bug fixed
* scroller
* scroller
* fixed syntax for PR #784
2019-04-02 18:26:31 +05:30
prateek srivastava
1492022c20
fixed syntax for PR #784
2019-04-02 18:24:43 +05:30
prateek srivastava
896b4eebc3
scroller
2019-04-02 18:07:54 +05:30
prateek srivastava
594d4598a5
scroller
2019-04-02 18:03:12 +05:30
prateek srivastava
e0fc65b0da
admin nav left menu scroll bug fixed
2019-04-02 17:57:34 +05:30
rahul shukla
39acb0de43
merge with master
2019-04-02 13:26:39 +05:30
rahul shukla
9e58602262
issue #758
2019-04-02 13:24:11 +05:30
Jitendra Singh
ba10a19319
Merge pull request #781 from prashant-webkul/development
...
fixed issue #765
2019-04-02 13:14:07 +05:30
Prashant Singh
f9cdc21066
fixed issue #765
2019-04-02 13:06:13 +05:30
Jitendra Singh
09dbdb3fea
Merge pull request #776 from imanghafoori1/master
...
Flattened the code
2019-04-02 11:42:44 +05:30
Prashant Singh
2493b9e614
Provided amend in issue #705
2019-04-02 11:36:33 +05:30
Prashant Singh
80743dc19b
fixed issue #705
2019-04-02 11:34:45 +05:30
Jitendra Singh
95ea54d220
Merge pull request #779 from prashant-webkul/development
...
Fixed issue #775
2019-04-02 10:27:43 +05:30
Prashant Singh
9c55f5037d
Fixed issue #775
2019-04-02 09:39:43 +05:30
imanghafoori
a84b81f446
flatten code
2019-04-01 18:39:15 +03:30
imanghafoori
1a4c040894
remove unused code
2019-04-01 18:38:18 +03:30
rahul shukla
56142bf3d8
issue #759
2019-04-01 20:00:54 +05:30
rahul shukla
84d4992944
issue #757
2019-04-01 18:06:16 +05:30
rahul shukla
5a41b57793
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-01 17:17:51 +05:30
rahul shukla
037126f82a
issue #757
2019-04-01 17:17:26 +05:30
Jitendra Singh
0bd03c2c62
Merge pull request #769 from cagartner/feature/add-id-streetlines
...
Added id attribute to streetlines
2019-04-01 15:15:24 +05:30
Prashant Singh
06aa4dd6bf
Fixed issue #749 for all customer resources profile, wishlist, reviews, orders and addresses
2019-04-01 12:45:56 +05:30
Prashant Singh
40ebb3a0c4
Fixed issue #749 for all customer resources profile, wishlist, reviews, orders and addresses
2019-04-01 12:43:44 +05:30
Prashant Singh
4a2efc8eee
fixed issue #749
2019-04-01 01:32:58 +05:30
Carlos Augusto Gartner
b8d78ab00d
Added id attribute to streetlines
2019-03-31 15:35:07 -03:00
Prashant Singh
91b4d1f955
fixed issue #761
2019-03-31 23:37:50 +05:30
Prashant Singh
0e1f26e835
fixed issue #763
2019-03-31 22:56:30 +05:30
Prashant Singh
ea99fc8c68
fixed issue 764
2019-03-31 22:41:14 +05:30
Prashant Singh
1d372621ce
Security fix for customer information and fixed issue #762
2019-03-30 18:55:10 +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
Prashant Singh
5346312ad0
revising issue #705
2019-03-30 16:50:53 +05:30
Prashant Singh
fc3c1a468b
fixed issue #705
2019-03-30 16:44:21 +05:30
rahul shukla
257dfc8b1e
rtl css for product list & currency capital
2019-03-29 16:48:00 +05:30
rahul shukla
8897a27499
issue #730
2019-03-29 13:11:49 +05:30
rahul shukla
12a8a91476
issue #727
2019-03-29 10:24:22 +05:30
rahul shukla
68bb6a6149
issue #706
2019-03-28 20:20:00 +05:30
Prashant Singh
fef1b2d8da
Fixing of 3rd level menu issue for custom roles #705
2019-03-28 18:09:29 +05:30
rahul shukla
d4c58724ae
issue #728
2019-03-28 15:36:48 +05:30
rahul shukla
fb6b4a13f1
issue #738
2019-03-28 14:29:45 +05:30
rahul shukla
0002f7caaa
issue #736
2019-03-28 12:50:00 +05:30
Prashant Singh
034deb05fc
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-28 10:35:24 +05:30
rahul shukla
179ac647d8
variable name change
2019-03-28 10:14:36 +05:30
rahul shukla
23fe05e192
issue #742
2019-03-28 10:10:26 +05:30
rahul shukla
fa0a3ee4ee
issue #706
2019-03-27 20:13:43 +05:30
rahul shukla
c2f24d47cb
merge with master
2019-03-27 14:26:52 +05:30
rahul shukla
a3b9ef427e
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-27 14:25:21 +05:30
Prashant Singh
abf563ced1
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-27 09:29:38 +05:30
Jitendra Singh
5a2a3c1988
Merge pull request #744 from cagartner/feature/default-laravel-translations
...
Created default laravel translation for pt_BR
2019-03-27 09:10:16 +05:30
Carlos Augusto Gartner
cbfe9a53dd
Created default laravel translation for pt_BR
2019-03-26 15:17:45 -03:00
Prashant Singh
e9b511a92a
probable solution for 3 level menu bug
2019-03-26 16:00:37 +05:30
rahul shukla
d4d93739dc
product zoom functionality added
2019-03-25 16:32:13 +05:30
Prashant Singh
54d2a000c8
Fixing some issues and probably solving later
2019-03-25 15:59:37 +05:30
rahul shukla
2a57530184
issue #735 & minor config changes for select
2019-03-22 14:54:46 +05:30
rahul shukla
e41445e802
issues #729 and #731
2019-03-22 12:54:38 +05:30
rahul shukla
e052276907
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-22 11:58:28 +05:30
rahul shukla
dca138ae85
issue #724
2019-03-22 11:58:11 +05:30
rahul shukla
dc08bbc06e
installer issue
2019-03-20 15:09:24 +05:30
Prashant Singh
c84e76646e
Fixed issue #720
2019-03-20 10:13:27 +05:30
Prashant Singh
b4c7bc550c
Fixed issue #712
2019-03-20 09:39:49 +05:30
Prashant Singh
8d486f336c
Fixed issue #708
2019-03-20 09:34:08 +05:30
Prashant Singh
8b85452097
changed the add to buttons in bagisto
2019-03-19 18:18:59 +05:30
Prashant Singh
b59c25bfb8
Bug fix
2019-03-19 16:19:41 +05:30
Prashant Singh
7ad8d567b1
Arabic translations added
2019-03-19 14:28:35 +05:30
Prashant Singh
2b17cdb7fd
fixed issue #713
2019-03-19 13:24:28 +05:30
Prashant Singh
97da404216
default channel now getting checked with admin
2019-03-19 13:22:06 +05:30
Jitendra Singh
7a0d470c20
Merge pull request #715 from rahulshukla-webkul/development
...
Development
2019-03-19 12:17:06 +05:30
Jitendra Singh
a34a2f2ba4
Merge pull request #714 from prashant-webkul/development
...
Development
2019-03-19 12:16:54 +05:30
Prashant Singh
40a0fa8cb0
Fixed issues #710 #709
2019-03-19 12:13:17 +05:30
rahul shukla
a9d1794547
changes in cross sell
2019-03-18 19:01:10 +05:30
rahul shukla
f54f8989dc
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-18 16:36:00 +05:30
rahul shukla
10f40c90ec
strict mode error
2019-03-18 16:35:41 +05:30
jitendra
41217e525f
Assets compiled for production
2019-03-15 19:31:23 +05:30
Jitendra Singh
947c1ab526
Merge pull request #702 from jitendra-webkul/jitendra
...
Jitendra
2019-03-15 19:07:55 +05:30
jitendra
94dfe8dc69
Fixed resource controller issue
2019-03-15 19:00:44 +05:30
jitendra
2123260387
Added formated price key in product api
2019-03-15 18:48:51 +05:30
Jitendra Singh
a222b221bf
Merge pull request #701 from jitendra-webkul/jitendra
...
Jitendra
2019-03-15 17:57:58 +05:30
jitendra
ef988b093f
Product base image property added in prodcut api
2019-03-15 17:47:54 +05:30
Prashant Singh
0a4fd97a0c
fixed issues with rtl
2019-03-15 17:14:13 +05:30
Prashant Singh
8b430988c4
assets compiled for production
2019-03-15 16:46:02 +05:30
Prashant Singh
d4f292490b
more probable solution for admin menu scrolling
2019-03-15 13:28:55 +05:30
Jitendra Singh
1759392af5
Merge pull request #698 from jitendra-webkul/jitendra
...
Category display mode feature added
2019-03-15 13:09:19 +05:30
jitendra
2e9f58917f
Category display mode feature added
2019-03-15 13:08:21 +05:30
Jitendra Singh
b615303003
Merge pull request #697 from jitendra-webkul/jitendra
...
Category Repository issue fixed
2019-03-15 12:01:17 +05:30
jitendra
340b621b1a
Category Repository issue fixed
2019-03-15 12:00:33 +05:30
Jitendra Singh
c23343377f
Merge pull request #696 from jitendra-webkul/jitendra
...
Sorting added in ResourceController
2019-03-15 10:37:20 +05:30
jitendra
4ca1095265
Sorting added in ResourceController
2019-03-15 10:36:27 +05:30
Jitendra Singh
c19e062cfd
Merge pull request #695 from jitendra-webkul/jitendra
...
Added getCurrentLocale function in Core.php
2019-03-14 18:24:40 +05:30
jitendra
218ef7a85f
Added getCurrentLocale function in Core.php
2019-03-14 18:24:02 +05:30
rahul shukla
a887cf8b92
slider controller name issue
2019-03-14 17:05:18 +05:30
Prashant Singh
319e4edeb1
some more logic is required for proper scrolling of menu bar
2019-03-14 15:50:24 +05:30
rahul shukla
4ed551c008
removing zoom
2019-03-14 14:41:21 +05:30
rahul shukla
4ab95b1464
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-14 14:34:46 +05:30
rahul shukla
ebf96ad9d6
installer isuue & product page changes
2019-03-14 14:34:32 +05:30
Prashant Singh
556dd64327
removed some dead code
2019-03-14 12:06:51 +05:30
jitendra
c38e107515
Added api for single lavel child categories
2019-03-14 11:32:47 +05:30
Prashant Singh
5fc85dffe4
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-14 11:01:04 +05:30
Prashant Singh
31eab00df7
added disbaled state to the new radio button used on checkout pages
2019-03-14 10:59:35 +05:30
Prashant Singh
d66f9de5dd
admin layout fixes
2019-03-13 19:47:40 +05:30
Prashant Singh
b6d14808b6
layout fixes in admin panel
2019-03-13 19:12:00 +05:30
Jitendra Singh
92adadb882
Merge pull request #689 from jitendra-webkul/jitendra
...
Added api for get request
2019-03-13 16:48:30 +05:30
jitendra
f489c42bdd
Added api for get request
2019-03-13 16:47:52 +05:30
rahul shukla
99405ebcaf
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-13 12:34:16 +05:30
rahul shukla
634dd0e458
translation added for configuration
2019-03-13 12:33:45 +05:30
Jitendra Singh
fcd99188da
Merge pull request #686 from jitendra-webkul/jitendra
...
Updated customer group mapping function name
2019-03-13 12:25:22 +05:30
jitendra
672f2f8c2b
Updated customer group mapping function name
2019-03-13 12:24:32 +05:30
rahul shukla
62d3685c24
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-13 11:05:33 +05:30
rahul shukla
281567456b
product linking completed
2019-03-13 10:33:43 +05:30
Prashant Singh
9f22696491
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-13 10:21:38 +05:30
rahul shukla
3bb197c75a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-13 09:38:36 +05:30
Carlos Augusto Gartner
ef30e1d0b5
Added pt-br translation for UI package
2019-03-12 15:36:15 -03:00
rahul shukla
9b82321d4f
change in related products
2019-03-12 21:05:10 +05:30
Prashant Singh
cd9504324c
Adding the scroll event script on navbar left in progress
2019-03-12 19:10:26 +05:30
Jitendra Singh
423fb8c446
Merge pull request #683 from jitendra-webkul/jitendra
...
'getAll' function of ProductRepository modified
2019-03-12 18:33:11 +05:30
jitendra
ff1154c422
'getAll' function of ProductRepository modified
2019-03-12 18:32:23 +05:30
Prashant Singh
e512bad843
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-12 18:31:46 +05:30
Prashant Singh
ec19630b22
Fixed some layout issues with admin
2019-03-12 18:31:15 +05:30
Jitendra Singh
7ad71d1d58
Merge pull request #682 from jitendra-webkul/jitendra
...
Update get all product function
2019-03-12 18:24:00 +05:30
jitendra
961e00227f
Update get all product function
2019-03-12 18:23:11 +05:30
Jitendra Singh
45afd5652e
Merge pull request #681 from cagartner/pt-br-translation
...
Added pt-br translation
2019-03-12 17:57:37 +05:30
Carlos Augusto Gartner
2e2d7d7642
Added pt-br translation
2019-03-12 09:19:27 -03:00
jitendra
a7eec79fbd
Editor added on category description textarea
2019-03-12 16:45:08 +05:30
jitendra
99e866d055
Fixed slider controller namespace issue
2019-03-12 16:03:57 +05:30
Prashant Singh
d2836b50ab
One way to hide the side drawer
2019-03-12 13:39:32 +05:30
Prashant Singh
97ce7dc195
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-12 12:25:50 +05:30
Prashant Singh
c9c5208693
Updated the list of exportable grids
2019-03-12 12:19:28 +05:30
Prashant Singh
9578f7609b
export functionality refactored
2019-03-12 12:13:48 +05:30
jitendra
12a4c6dc09
Fixed conflict and Assets compiled for prodcution
2019-03-12 12:04:55 +05:30
jitendra
42b5f91764
Feature Request #666 implented
2019-03-12 11:59:00 +05:30
Prashant Singh
9eb1deb3fa
Datagrid export functionality refactoring
2019-03-12 11:07:12 +05:30
Jitendra Singh
4dc7ef649c
Merge pull request #673 from prashant-webkul/development
...
disabled side menu toggle for admin, created configuration for produc…
2019-03-12 09:57:57 +05:30
Prashant Singh
9cfbdc6c1b
Filterable checks implemented in datagrid
2019-03-11 19:36:58 +05:30
Prashant Singh
238c248852
Filterable checks implemented in datagrid
2019-03-11 19:36:15 +05:30
Jitendra Singh
ff45ce45d3
Merge pull request #674 from jitendra-webkul/jitendra
...
Modified Slider Model
2019-03-11 18:44:06 +05:30
jitendra
91c55a7010
Modified Slider Model
2019-03-11 18:43:06 +05:30
Prashant Singh
bd525ef606
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-11 18:42:34 +05:30
Prashant Singh
20247136a0
disabled side menu toggle for admin, created configuration for product types
2019-03-11 18:39:42 +05:30
rahul shukla
19f4429de0
issue #670
2019-03-11 17:57:15 +05:30
Jitendra Singh
43f7d7e9c1
Merge pull request #665 from rahulshukla-webkul/development
...
issue #655
2019-03-08 14:32:24 +05:30
rahul shukla
3ad2aec865
issue #655
2019-03-08 13:31:16 +05:30
Jitendra Singh
d1489fa498
Merge pull request #663 from jay-thanki/patch-2
...
subscriber_email email changes
2019-03-08 11:54:13 +05:30
Jay Thanki
727e6a2b89
subscriber_email email changes
...
change email subscriber_email as footer field assign to this field.
2019-03-08 11:31:31 +05:30
Jay Thanki
23db740306
subscriber_email changes
...
email names are same for signup form and footer email address field. so i changed footer email addess to subscriber_email
2019-03-08 11:31:18 +05:30
rahul shukla
4e803a638b
reverting category changes
2019-03-07 18:31:18 +05:30
rahul shukla
faf2400a75
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-07 18:22:08 +05:30
rahul shukla
b0d0e63d0d
issues #656 , #618 , #384 & linked products changes
2019-03-07 18:21:49 +05:30
Prashant Singh
1e215e43c0
Some html attributes added on the checkout pages
2019-03-07 10:05:05 +05:30
Prashant Singh
17755bcc2d
assets for the UI package compiled for production
2019-03-06 11:54:27 +05:30
rahul shukla
c2ae22a262
merge with master
2019-03-05 18:35:44 +05:30
rahul shukla
76aa1da818
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-05 18:33:58 +05:30
rahul shukla
95c898c4a8
up-sell, cross-sell & related-product
2019-03-05 18:32:15 +05:30
Prashant Singh
aac1c583f5
assets compiled for production
2019-03-05 16:32:12 +05:30
Prashant Singh
7ae4be56b8
fixed issue #642 , made changes in layout of checkout section, various display bugs had been fixed
2019-03-05 16:28:55 +05:30
rahul shukla
eb38784f7f
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-05 15:16:35 +05:30
rahul shukla
24faf854c5
up-sellling completed
2019-03-05 15:16:17 +05:30
jitendra
1079331358
Conflict fixed
2019-03-05 13:17:58 +05:30
jitendra
4c28aceab5
Product gallery selected thumbnail border color changed to brand color
2019-03-05 13:15:21 +05:30
JItendra Singh
f7d8f726f7
Merge pull request #644 from prashant-webkul/development
...
changed address card class on onepage checkout
2019-03-05 10:55:11 +05:30
JItendra Singh
c0dd164345
Merge pull request #648 from jitendra-webkul/jitendra
...
Excluded image swatch attributes from layed navigation
2019-03-05 10:54:38 +05:30
jitendra
70c4e69aaf
Excluded image swatch attributes from layed navigation
2019-03-05 10:53:50 +05:30
rahul shukla
ab9bf8ea97
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-04 10:11:39 +05:30
rahul shukla
ca39b84d0b
upsell product
2019-03-04 10:11:24 +05:30
Prashant Singh
54835099ba
made the changes in checkout page by applying id attribute for all sections, so it would be easy for js to identify the section and usage of the script accordingly, the primary need was to add the id attribute on the continue button as it was needed for the section validation
2019-03-02 14:01:34 +05:30
Prashant Singh
9df1c291a6
Checkout's payment method front end rendering order function changed from unshift to push
2019-03-01 18:17:21 +05:30
Prashant Singh
bce57ed750
changed address card class on onepage checkout
2019-03-01 11:21:53 +05:30
JItendra Singh
2c3d1d1096
Merge pull request #641 from prashant-webkul/development
...
Development
2019-03-01 11:08:37 +05:30
Prashant Singh
62f8cf1bad
Fixed issue #642
2019-03-01 11:05:56 +05:30
JItendra Singh
da73d59853
Merge pull request #643 from jitendra-webkul/jitendra
...
ACL issue fixed
2019-03-01 11:01:11 +05:30
jitendra
e099492fd9
ACL issue fixed
2019-03-01 11:00:15 +05:30
Prashant Singh
543af40328
Issue in shipments grid is fixed
2019-02-28 16:29:46 +05:30
Prashant Singh
d84cf69661
Fixed the issue #620
2019-02-28 16:24:10 +05:30
Prashant Singh
ccea6689f1
address card list issue fix
2019-02-28 10:54:10 +05:30
Prashant Singh
e2facbc329
All the color values have been converted into variables for shop package
2019-02-28 10:37:21 +05:30
JItendra Singh
674639a008
Merge pull request #640 from jitendra-webkul/jitendra
...
Jitendra
2019-02-27 20:30:44 +05:30
jitendra
876041aee4
Issue #639 fixed
2019-02-27 20:30:07 +05:30
jitendra
efa2dd143b
Issue #638 fixed
2019-02-27 20:10:04 +05:30
jitendra
d05edec01e
Color swatch issue fixed
2019-02-27 20:09:21 +05:30
JItendra Singh
56a413c37b
Merge pull request #637 from jitendra-webkul/jitendra
...
Shipment grid issue fixed
2019-02-27 19:18:07 +05:30
jitendra
cceed7d048
Shipment grid issue fixed
2019-02-27 19:17:13 +05:30
JItendra Singh
73a3654773
Merge pull request #634 from jitendra-webkul/jitendra
...
Front review date format changed
2019-02-27 16:29:48 +05:30
jitendra
ff37ad3c58
Front review date format changed
2019-02-27 16:29:03 +05:30
JItendra Singh
268ec5e425
Merge pull request #632 from prashant-webkul/development
...
Development
2019-02-27 14:46:24 +05:30
Prashant Singh
bd5c88a29e
eventbus events on checkout onepage
2019-02-27 14:28:50 +05:30
jitendra
570442ad3e
Fixed cart controller issue
2019-02-27 13:07:27 +05:30
jitendra
d7d8eb31a8
Increased datagrid deafult pages limit to 15
2019-02-27 12:27:07 +05:30
jitendra
e5f1abe7a9
Product grid item per page increased to 20
2019-02-27 12:02:48 +05:30
jitendra
01f3cd7324
convertToBasePrice function added to Core class
2019-02-26 19:07:51 +05:30
jitendra
1ce5a957f9
convert price function issue fixed
2019-02-26 18:45:55 +05:30
Prashant Singh
c5aceb72d0
event bus events added in onepage checkout for shipping and payments
2019-02-26 18:24:38 +05:30
jitendra
90540d445e
Fixed swatch issue
2019-02-26 14:32:18 +05:30
rahul shukla
c02d75774d
rtl class removal
2019-02-26 14:18:42 +05:30
rahul shukla
724c81ffd7
conflict resolve
2019-02-26 14:13:07 +05:30
JItendra Singh
2775885b61
Merge pull request #625 from jitendra-webkul/jitendra
...
Added margin top on pagination
2019-02-26 13:14:59 +05:30
jitendra
71ddbacbd8
Added margin top on pagination
2019-02-26 13:14:18 +05:30
JItendra Singh
7ab9b2d6f7
Merge pull request #624 from jitendra-webkul/jitendra
...
Issue #588 fixed
2019-02-26 13:07:41 +05:30
jitendra
0f382acbf4
Issue #588 fixed
2019-02-26 13:06:51 +05:30
JItendra Singh
8394fc19ae
Merge pull request #623 from jitendra-webkul/jitendra
...
Issue #621 fixed
2019-02-26 13:00:35 +05:30
jitendra
4f420ca483
Issue #621 fixed
2019-02-26 12:59:58 +05:30
JItendra Singh
242b64afbf
Merge pull request #614 from prashant-webkul/development
...
Development
2019-02-26 11:56:43 +05:30
JItendra Singh
c1d890ee56
Merge pull request #622 from jitendra-webkul/jitendra
...
Option swatches feature added
2019-02-26 11:55:42 +05:30
jitendra
0c84a9dcb2
Option swatches feature added
2019-02-26 11:55:00 +05:30
rahul shukla
35cdb1fd52
rtl css changes for admin
2019-02-25 19:05:45 +05:30
rahul shukla
7cfc0d3710
issue #618 & #619 & rtl css changes
2019-02-25 18:06:18 +05:30
Prashant Singh
f79473a598
fixed issue #589
2019-02-25 09:45:12 +05:30
Prashant Singh
5e704a4979
more testcases for customer authentication
2019-02-23 17:23:46 +05:30
Prashant Singh
53094cadca
Auth tests written
2019-02-23 16:13:24 +05:30
rahul shukla
db0cd27c0d
issue #615
2019-02-22 17:05:27 +05:30
Prashant Singh
3d94bfcd6e
migration name changed according to current conventions
2019-02-22 16:25:49 +05:30