746a17dcf6
conflict resolve
2019-07-08 13:13:34 +05:30
c7add7e2fe
removal of excess code in search, locale & currency
2019-07-08 13:10:41 +05:30
2c45ddee13
Merge pull request #1157 from danielpinon/patch-1
...
Updating translations of languages in pt_BR
2019-07-08 12:13:54 +05:30
723f6ad639
Clearing duplicity
2019-07-06 23:59:59 -03:00
c5fe78014c
Updating translations of languages in pt_BR
2019-07-06 23:58:01 -03:00
8c19d9e0ce
removed dead code
2019-07-06 17:47:45 +05:30
c8e8df1699
Added configuration for cart rules
2019-07-06 17:41:58 +05:30
54481ebbfe
slider edit issue
2019-07-05 18:15:22 +05:30
2f2f97a6d0
category check condition for sorting
2019-07-05 13:33:06 +05:30
f9863f440f
category check condition for sorting
2019-07-05 13:24:46 +05:30
3fe220428c
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-05 13:23:56 +05:30
1592c9e37f
Fixed downloadable issues with locale change
2019-07-05 11:52:14 +05:30
1fd25cfc92
Added currency symbol in currencies table
2019-07-05 11:46:45 +05:30
e33a374e67
Shop package views reste
2019-07-05 11:18:11 +05:30
bb182972f8
Fixed issue #83
2019-07-04 18:20:49 +05:30
6cb1f0f699
Fixed a bug in SAAS module core
2019-07-04 16:01:04 +05:30
65df13c545
Fixed a bug related to rul parameter
2019-07-04 15:57:13 +05:30
c3622fa53b
Fixed bug related to preorder
2019-07-04 14:29:49 +05:30
cfaee2f432
issue #1147
2019-07-04 13:56:18 +05:30
f5059364c2
Changes made to stripe connect, all the dependencies hard coded for connect in SAAS module had been successfully migrated
2019-07-04 13:42:05 +05:30
9eb4b89344
json removed
2019-07-04 13:25:08 +05:30
44a72db99e
maximum price according to category
2019-07-04 13:20:21 +05:30
60435b724f
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-04 12:38:36 +05:30
c56d94f7a4
issue #968 and dependent field
2019-07-04 12:38:20 +05:30
fdd3ff8779
Fixed issue with stripe
2019-07-03 18:51:35 +05:30
b868887ccc
Fixed preorder bug
2019-07-03 18:16:07 +05:30
80ea917581
Shop package view reset
2019-07-03 15:24:25 +05:30
a514ad5c02
Added jwt service provider to app.php
2019-07-03 15:16:06 +05:30
7053a425c2
Fixed issue #76
2019-07-03 15:12:29 +05:30
3d552b79fe
A small bug fix in shop price after login
2019-07-03 14:01:24 +05:30
5b3bde0d3a
Fixed issue with customer document #74
2019-07-03 13:35:27 +05:30
f8d38e9bbd
Enabled usage parameters of cart rule in create and edit form
2019-07-03 11:37:09 +05:30
dfc0941fe4
Added the purge pool configuration file in the saas module
2019-07-03 10:56:04 +05:30
42c2f07dbc
Actual resource tree formed
2019-07-03 10:21:05 +05:30
71f0556e9f
Updated the frontend files for show price after login and publish path changed to a general folder resources
2019-07-02 18:39:07 +05:30
31b6e779d6
Fixed image wrapper css issue
2019-07-02 17:55:56 +05:30
f3d3dcd733
Now product types can have additional form validations
2019-07-02 16:59:47 +05:30
1fb5d9b1fc
Removed unnecessary classed from product types
2019-07-02 14:44:07 +05:30
2ce18e5a49
Placing the conflicted files of show price after login and preorder to the actual paths instead of altering the original shop package view files
2019-07-02 14:23:21 +05:30
46d1ec1fc9
Over ride of summary.blade.php according to stripe connect done
2019-07-02 14:15:32 +05:30
9276a695b6
Some fixes in stripe
2019-07-02 14:09:26 +05:30
9042757f4f
Updated the get root categories method inside category repository class
2019-07-02 13:04:14 +05:30
12c321e80e
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-02 12:45:59 +05:30
bfe52a7d3c
Enabling coupon usage option for cart rules and start of the program convertxtoproductid
2019-07-02 12:45:30 +05:30
f529a128cd
Removed unnecessary code from sevice providers
2019-07-01 20:03:16 +05:30
318857b785
Now images will be deleted too if the model gets deleted
2019-07-01 19:42:12 +05:30
0e0cd7237a
change in Get root category
2019-07-01 18:07:43 +05:30
b7d346260a
Resolve conflicts
2019-07-01 17:12:44 +05:30
366a5fdd20
Refactor code standard
2019-07-01 17:03:36 +05:30
350ffb1fa9
Fixes in preorder
2019-06-29 20:41:15 +05:30
07e90ae0f4
git add .
2019-06-29 20:40:28 +05:30
1c1dc3c834
fixed issue with preorder button not coming on storefront
2019-06-29 19:34:04 +05:30
170377509c
Fixed search issue in preorder datagrid
2019-06-29 19:21:18 +05:30
3d352b690a
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-29 18:49:08 +05:30
e9608d87ef
Merge pull request #1143 from prashant-webkul/development
...
Development
2019-06-29 18:49:00 +05:30
e0bbae7f8a
Try catch handler in move to cart from wishlist
2019-06-29 18:47:22 +05:30
be2b55a898
fixed event fire on movetocart from wishlist
2019-06-29 18:44:23 +05:30
e7e9c24451
Preorder path fixes after updation
2019-06-29 18:35:27 +05:30
da29f58531
Publishing for frontend files stopped for preorder and show price after login
2019-06-29 18:20:49 +05:30
1057cd654e
Updated preorder in SAAS
2019-06-29 18:19:39 +05:30
337c45426f
Merge pull request #1142 from rahulshukla-webkul/development
...
style for dashboard
2019-06-29 18:16:39 +05:30
1b43e9c253
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-29 18:14:42 +05:30
2f905203a2
style for dashboard
2019-06-29 18:12:07 +05:30
f08a8036e6
Resolved conflict
2019-06-29 17:57:10 +05:30
3ef416b22e
Added downloadable order item info
2019-06-29 17:51:49 +05:30
842a0f77d4
Merge pull request #1141 from prashant-webkul/development
...
Added cart item add before event
2019-06-29 17:50:14 +05:30
e3bc993c99
Added cart item add before event
2019-06-29 17:24:41 +05:30
8155637f39
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-29 17:10:05 +05:30
44af368b9c
Merge pull request #1139 from rahulshukla-webkul/development
...
css changes for overflow
2019-06-29 17:09:32 +05:30
77af67ffd1
Merge pull request #1140 from prashant-webkul/development
...
Development
2019-06-29 17:09:19 +05:30
ec2baa1be9
bug fix for event fire
2019-06-29 17:07:19 +05:30
ff863fcc54
Added cart item add after event for move to cart from wishlist
2019-06-29 17:04:18 +05:30
3d02016db4
Customer document icon applied
2019-06-29 16:27:07 +05:30
4e8b5d875c
Updated credit max
2019-06-29 16:02:03 +05:30
15690a1f0d
Company id check removed from admins
2019-06-29 15:56:13 +05:30
8ef75d2be7
Fixed bug with admins user was coming in check with current company
2019-06-29 15:54:35 +05:30
67c3eeb25e
customer document bug fix
2019-06-29 15:46:10 +05:30
76742eff85
Customer documents bug fix
2019-06-29 15:41:57 +05:30
b8c0f4aed6
css changes for overflow
2019-06-29 15:26:26 +05:30
ad6e422fdb
Added downloadable and virtual products
2019-06-29 15:23:34 +05:30
6c003f949f
Company check implemented in customer document module
2019-06-29 15:21:53 +05:30
d164178609
Fixed a stripe transaction fee view bug in shop bundle
2019-06-29 14:52:15 +05:30
82db366587
Updated bulk add to cart and customer document
2019-06-29 14:46:42 +05:30
930788212d
Added preorder in acl
2019-06-29 12:53:28 +05:30
f010b80cc2
Added StripeConnect and Customer Document in acl configuration
2019-06-29 12:50:57 +05:30
37409709ce
Fixed dashboard arrow icon issue
2019-06-29 12:14:50 +05:30
edc53c90f9
Fixed channel root category issue
2019-06-29 12:11:35 +05:30
f526eb9337
Added the stripe transaction amount in cart before transacting using stripe and reducing it if payment fails.
2019-06-29 11:46:49 +05:30
04462c7212
Customer document updated
2019-06-29 11:40:58 +05:30
d891fb108c
Stripe Icon Added
2019-06-29 11:34:11 +05:30
51f0eec908
Added column in preorder datagrid and corrected the spelling in customer document
2019-06-29 11:05:58 +05:30
55b71e1e66
updated
2019-06-28 19:48:52 +05:30
c217598843
Ignored customer documents table from DBManager
2019-06-28 18:28:49 +05:30
f6f06d7a40
Updated credit max module
2019-06-28 17:22:17 +05:30
e6c20fa11e
table in email template
2019-06-28 17:20:47 +05:30
b00374fa81
Updated preorder package for customization
2019-06-28 17:20:19 +05:30
34fd4e3840
assets compile for production
2019-06-28 17:11:26 +05:30
8e9768f947
assets compile for production
2019-06-28 17:08:30 +05:30
d5b66ebf9e
table in email template
2019-06-28 17:05:08 +05:30
baf104509b
Updated the customer document module
2019-06-28 17:01:00 +05:30
794aac2c8e
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-28 16:57:17 +05:30
ba8fb649e7
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-28 16:33:08 +05:30
beabada35e
acl added for cart rule & dashboard css changes
2019-06-28 16:30:36 +05:30
8a5d57bcc6
new compiled assets for production
2019-06-28 16:30:36 +05:30
fce7ec8586
Assets compiled for production and updated the changelog for new release v0.1.6
2019-06-28 16:29:41 +05:30
0088bf7709
check in phone column unique removal
2019-06-28 15:44:17 +05:30
7c8dc15c58
check in phone column unique removal
2019-06-28 15:43:53 +05:30
fdb9252b2a
check for phone column & verrion last digit check in installer
2019-06-28 15:18:48 +05:30
c4ec5853e2
Fixed conditions issue
2019-06-28 15:13:57 +05:30
5174c02bb0
Problem with does not contains condition is not fixed
2019-06-28 14:49:37 +05:30
35b8af8d47
Non argument fix for reset shipping
2019-06-28 13:29:39 +05:30
a304795c36
Fixed issues with buy atleast
2019-06-28 12:59:40 +05:30
e8dd4219a7
Apply on shipping working on cart rule
2019-06-28 12:57:19 +05:30
02faaf7415
Added reset shipping when applying coupon cart rule
2019-06-28 11:30:01 +05:30
e4612d8629
Fixed some discrepancies in apply to shipping in cart rules
2019-06-28 10:56:44 +05:30
4339475e70
CheckOnShipping method added to check where rule applies on shipping or not
2019-06-27 19:55:36 +05:30
25007824eb
Shipping now getting applied according to selected shipping method
2019-06-27 19:51:17 +05:30
4db41973fd
Removed the option of BuyAGetB as its current functionality was same as Fixed amount
2019-06-27 18:34:37 +05:30
216b409531
Apply to shipping and free shipping now added in normal flow
2019-06-27 17:09:56 +05:30
ec0277d3fb
Some improvements in super admin panels for SAASModule
2019-06-27 16:58:57 +05:30
e17da6fdfa
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-27 16:41:46 +05:30
5135ef5f34
Optimized validates discount class as it was creating redundancy with discount class
2019-06-27 16:40:57 +05:30
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
db12a1587f
Fixed issue with cart rule validation when placing order
2019-06-27 16:27:06 +05:30
af100ac04e
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-27 16:20:29 +05:30
4feeffaf51
Merge pull request #1124 from prashant-webkul/development
...
Fixed issue #1080
2019-06-27 16:18:13 +05:30
9b83fb8025
Fixed issue #1080
2019-06-27 16:14:24 +05:30
3e86f81681
Base sync with core master
2019-06-27 15:05:13 +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
79b5e1c4cd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-27 14:38:48 +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
3f79f2b89a
Fixed issue #1114 , #1112
2019-06-27 13:30:45 +05:30
bebf5e105b
Base sync with github master
2019-06-27 13:11:48 +05:30
fd06d6dc26
Merge pull request #1117 from jitendra-webkul/jitendra
...
Removed propaganistas/laravel-intl dependency
2019-06-27 13:03:12 +05:30
2a5e8b1ddd
Removed propaganistas/laravel-intl dependency
2019-06-27 13:01:47 +05:30
367f1771a8
Merge pull request #1116 from prashant-webkul/development
...
Added remove logic in coupon rule class
2019-06-27 13:00:04 +05:30
5073226872
Added remove logic in coupon rule class
2019-06-27 12:58:41 +05:30
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
64a6f06357
Cart rule guest issues and discount price not visible in cart summary is now fixed
2019-06-27 12:56:31 +05:30
0102dd0c30
Merge pull request #1111 from prashant-webkul/development
...
Development
2019-06-27 11:45:23 +05:30
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
9ba162e7a0
Critical bug fix in super admin security
2019-06-27 04:43:45 +05:30
c539e017fe
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-27 04:38:41 +05:30
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
8a37088b9f
Omitted the applicable rules that gives 0 value discounts
2019-06-27 02:25:44 +05:30
7e8ae8022b
Some conditions changed according to end_other_rules attribute
2019-06-27 02:18:47 +05:30
72cf1c0226
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-27 01:36:18 +05:30
6d40b54d1d
Remote sync
2019-06-27 01:36:11 +05:30
c783ffa966
Added more checks for noncouponable and couponable rule interfaces
2019-06-27 01:32:32 +05:30
54fa3419f3
admin name for attribute
2019-06-26 21:03:52 +05:30
62cb90e014
status for customer
2019-06-26 18:02:14 +05:30
73d9966a12
Fixed issue #1108
2019-06-26 16:42:53 +05:30
9a92a61724
try & catch added in buynow
2019-06-26 16:40:15 +05:30
1573ae5261
Added product export feature, to be migrated in core framework
2019-06-26 14:39:24 +05:30
397d83e64f
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-26 14:36:54 +05:30
fe14287b07
Merge pull request #1106 from prashant-webkul/development
...
Development
2019-06-26 14:33:29 +05:30
00ba0f2e71
Fixed issue with guest checkout when looking for cart rules based on guest customer groups
2019-06-26 14:30:32 +05:30
00bb4b0367
Preorder bug fixes
2019-06-25 17:08:52 +05:30
85ed096185
Fixes in customer document, removal of session from company facade
2019-06-25 16:56:57 +05:30
02be744066
Removed is_guest check from couponable and non couponable rules
2019-06-25 15:36:41 +05:30
ead9f2d465
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-25 15:04:41 +05:30
a60e339218
Merge pull request #1105 from prashant-webkul/development
...
Development
2019-06-25 15:02:46 +05:30
af04acf76e
Fixes in preorder
2019-06-25 15:00:34 +05:30
ddb2f1b59f
Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development
2019-06-25 14:57:57 +05:30
ecd766cb81
Some changes in frontend regarding coupon form on checkout
2019-06-25 14:57:26 +05:30
68c22f38f6
improvements in cart rules
2019-06-25 14:44:14 +05:30
44947074a4
added discount threshold check in fixed amount cart rule
2019-06-25 13:37:24 +05:30
35a87aa7fd
Added more security fixes for cart rules
2019-06-25 13:19:58 +05:30
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
1a262e0f27
Fixed some bugs in cart rules
2019-06-25 12:27:13 +05:30
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
3382ffc076
Customer group catalog fixed
2019-06-24 19:23:20 +05:30
35c8402749
Store front files published according to new customer group categoru
2019-06-24 18:52:45 +05:30
cc649c83da
Fixed customer group category
2019-06-24 18:47:29 +05:30
a7d1c5e518
PreOrder fixes
2019-06-24 18:25:47 +05:30
b0efd192e2
removed undefined variable rule from checkout/save payment
2019-06-24 18:03:31 +05:30
7fd8122251
Fixed issue with preorder
2019-06-24 17:10:33 +05:30
f825be085a
Customer document fixed
2019-06-24 17:06:14 +05:30
e79701b037
customer group catalog fixed
2019-06-24 16:06:46 +05:30
e130e79121
Fixed issue with preorder not showing button
2019-06-24 12:09:47 +05:30
714d9deed1
updated package of customer group catalog
2019-06-24 11:22:06 +05:30
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
bddb039ce6
Fixed a bug related to product review write in showprice after login
2019-06-22 17:06:16 +05:30
791dd64800
Preorder and show price after login integrated in shop views
2019-06-22 16:57:36 +05:30
7d023afa5b
conditions now more properly grouped for show price after login functionalities
2019-06-22 16:52:46 +05:30
14546dc12d
Show price after login permanently integrated into the system
2019-06-22 16:40:12 +05:30
3aa0135aec
changed shop blade files according to show price after login
2019-06-22 16:27:56 +05:30
e327ee2b05
reverted shop packages views
2019-06-22 15:18:10 +05:30
b11f5fe46f
Refactoring show price after login blade files
2019-06-22 15:01:20 +05:30
bce5997b11
Reverted blade files to original
2019-06-22 14:53:30 +05:30
c3bfcf5d79
Show price after login modified
2019-06-22 13:53:36 +05:30
1d988dd82a
Show price after login refactor
2019-06-22 13:18:22 +05:30
813bccf758
Totally fixed registration form
2019-06-22 13:04:13 +05:30
75f45b765c
More stripe settings added for seller
2019-06-22 12:30:50 +05:30
07858f5ef7
Registration form fixed
2019-06-22 12:03:54 +05:30
cf0f54cc7a
Registration form fixed with unique validations
2019-06-22 11:57:56 +05:30
0d2ed2bab4
Registration fixed
2019-06-22 11:03:33 +05:30
0fb24ce320
Preorder made compatible with SAAS module
2019-06-22 10:59:15 +05:30
6fd67e56d7
New repo with base sync
2019-06-22 01:02:33 +05:30
754d99d3ba
Merge pull request #1094 from rahulshukla-webkul/development
...
issue #1015 pagination responsive
2019-06-21 16:29:08 +05:30
d547ab5058
Merge pull request #1090 from prashant-webkul/development
...
Development
2019-06-21 16:28:59 +05:30
7d2b751479
issue #1015 pagination responsive
2019-06-21 16:17:37 +05:30
a35c997a56
issue #1014
2019-06-21 15:01:51 +05:30
ba26a39f74
issue #951
2019-06-21 14:41:22 +05:30
df57ef9f84
issue #1086
2019-06-21 12:05:37 +05:30
9080f1e278
removed inline css
2019-06-21 11:37:31 +05:30
b0c35ead9f
icon issue in admin dashboard
2019-06-21 11:23:27 +05:30
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
937d91ea5b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-20 18:10:07 +05:30
12846df91c
quantity issue in discount
2019-06-20 17:49:14 +05:30
048585853d
repository insted of model in attribute create & edit for locale
2019-06-20 15:12:28 +05:30
bfac46ffdf
Merge pull request #1079 from rahulshukla-webkul/development
...
issue of discount amount in order #1053
2019-06-20 14:34:11 +05:30
264d2e3c9e
Added cart rule validation function which validates the cart rule and added unique coupon check while creating or updating couponable cart rule
2019-06-20 13:03:01 +05:30
f72529f0fb
issue of discount amount in order #1053
2019-06-20 12:17:11 +05:30
f1f7d03f6f
Merge pull request #1078 from rahulshukla-webkul/development
...
flash message for discount & error
2019-06-20 11:04:55 +05:30
d76d8bd129
flash message for discount & error
2019-06-19 21:18:16 +05:30
acad17af67
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-19 18:21:26 +05:30
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
423824b531
Fixed issue #1075 and #1074
2019-06-19 18:13:41 +05:30
144bda6590
review page render in onepage
2019-06-19 17:08:36 +05:30
5b98b9a86d
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-19 16:32:48 +05:30
be8c11aa98
issue #1069
2019-06-19 16:32:38 +05:30
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
10e60dd4d7
Merge pull request #1071 from jitendra-webkul/jitendra
...
Fixed checkout summary refresh issue
2019-06-19 15:16:28 +05:30
aa1a5451bd
Fixed checkout summary refresh issue
2019-06-19 15:15:27 +05:30
d1c0be06ae
Cart rule coupons sync bugs fixed
2019-06-19 14:57:13 +05:30
8e648af885
Fixed issue #1003
2019-06-19 14:52:30 +05:30
bf6a6109f4
Fixed issue #1057
2019-06-19 11:16:01 +05:30
68e0ba1ac1
Fixed issue #1054
2019-06-19 10:58:02 +05:30
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
c2320410ab
cart rule issue fix
2019-06-18 19:17:16 +05:30
be62623022
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-18 19:16:14 +05:30
e0f93aae56
Fixed issue in cart rule actions
2019-06-18 19:14:49 +05:30
210be70779
Merge pull request #1049 from prashant-webkul/development
...
all calculations now changed to base price
2019-06-18 19:02:39 +05:30
9e80687960
Fixed customer group bug in cart rule and fixed a bug in coupon apply rule
2019-06-18 19:00:24 +05:30
d25cc60351
issues #1056 & 1058
2019-06-18 18:05:52 +05:30
9166daa31b
issues #1056 & 1058
2019-06-18 17:58:34 +05:30
3af3996439
buy now issue
2019-06-18 17:42:11 +05:30
bcdb4efb6c
Fixed a bug in application of cart rule
2019-06-17 18:48:54 +05:30
1144ce7e10
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-17 18:32:12 +05:30
94b67d00c1
admin css changes
2019-06-17 18:31:52 +05:30
0b5f50f1b0
depandent field added in configuaration
2019-06-17 18:22:23 +05:30
9c379f1ba4
Bug fix in cart rule
2019-06-17 16:22:18 +05:30
82d916c646
cart rule action percent of product changed to base price of item
2019-06-17 16:20:53 +05:30
d0c5589800
all calculations now changed to base price
2019-06-17 14:25:38 +05:30
4b99f5acf9
Summary template now re rendering on applying and removal of coupon
2019-06-17 14:16:51 +05:30
c2c0836b85
Couponable rule getting over ride by previously applied non-couponable rule
2019-06-17 13:09:21 +05:30
d18667351c
Base sync
2019-06-17 12:38:29 +05:30
b79e45ee7b
Clearing discount when applying or updating a new rule over current cart
2019-06-17 12:34:56 +05:30
f3437ee214
Fixed issues with discount as collect totals was not getting called on applying couponable rule
2019-06-17 12:33:34 +05:30
90c229442d
Fixed issues with testing criteria of cart rule conditions
2019-06-17 12:24:19 +05:30
ea185aad7b
Discount package bug fixes and complete refactor with overriding features for actions
2019-06-17 08:56:30 +05:30
b390d668f0
Added customer groups conditions in non couponable rules
2019-06-16 22:56:26 +05:30
ba31ecd527
Cart rule create and edit forms bug fixes
2019-06-16 22:18:19 +05:30
15abe379e0
Changed frontend attributes and syntax fixes in checkout
2019-06-16 17:26:06 +05:30
b93bc11c65
Fixed js error in checkout page
2019-06-15 22:28:21 +05:30
27b4ee19e5
Checkout coupon apply issue fixed
2019-06-15 22:22:40 +05:30
ba240925a4
Added v-debounce directive
2019-06-15 19:51:10 +05:30
a2d1e1aa85
Column 'code' added in customer_groups table
2019-06-15 18:50:38 +05:30
9ae4f8a801
Fixed issues with cart rule customer groups
2019-06-15 18:47:53 +05:30
1f5d8a8f28
Revert "Revert "Development""
2019-06-15 16:50:37 +05:30
545cd7386e
Revert "Revert "Fixed issue with order summary rendering on cart page""
2019-06-15 16:49:02 +05:30
d4d9c3e5ee
Revert "Revert "Added Guest default customer group with id 0""
2019-06-15 16:48:29 +05:30
1a15791f9d
Merge pull request #1039 from jitendra-webkul/jitendra
...
Reset changes
2019-06-15 16:47:36 +05:30
e3946a79dd
Reset changes
2019-06-15 16:46:55 +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
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
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
ea3a08a198
Merge pull request #1035 from bagisto/revert-1029-development
...
Revert "buy now issue"
2019-06-15 15:13:16 +05:30
426cbe0ae5
Revert "Added Guest default customer group with id 0"
2019-06-15 15:10:11 +05:30
fb5687c451
Revert "buy now issue"
2019-06-15 15:10:10 +05:30
668f92185b
Revert "Development"
2019-06-15 15:10:04 +05:30
7ac715e93d
Revert "Fixed issue with order summary rendering on cart page"
2019-06-15 15:09:59 +05:30
0927786cee
Fixed issue with order summary rendering on cart page
2019-06-15 14:56:24 +05:30
eaa755bbea
Fixed discount on frontend
2019-06-15 13:13:07 +05:30
8d68be8e07
Rule condition discount calculation now working properly
2019-06-15 12:27:54 +05:30
fc43b158dd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-15 10:49:04 +05:30
3a8b923f5c
Discount rule
2019-06-14 23:48:08 +05:30
076f197de7
buy now issue
2019-06-14 21:04:22 +05:30
c36950c609
applied translation string in apply coupon responses
2019-06-14 20:26:54 +05:30
0188644fce
Prepared standard responses when applying couponable rules
2019-06-14 20:04:32 +05:30
bb097be557
Added error message provision in the same when coupon application fails
2019-06-14 19:58:25 +05:30
bec9ebe7fb
coupon section fix in review-order component
2019-06-14 19:52:58 +05:30
1e865986c4
improved conditions check in applying cart rules
2019-06-14 19:24:15 +05:30
da82f2935c
removed some dead code
2019-06-14 17:55:03 +05:30
e26c2b4d89
Added Guest default customer group with id 0
2019-06-14 16:41:18 +05:30
3f814d9253
Fixed checkout issue
2019-06-14 15:13:20 +05:30
8fcca7363d
Merge pull request #1026 from jitendra-webkul/jitendra
...
Fixed checkout issue
2019-06-14 15:00:15 +05:30
5b81968bae
Fixed checkout issue
2019-06-14 14:59:29 +05:30
c8fb37698c
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-14 14:22:50 +05:30
0bdd03b331
ticket 201 error & admin css for back icon
2019-06-14 14:22:22 +05:30
4bfefd3a07
base sync
2019-06-14 13:22:37 +05:30
c52238e45e
Cart rule frontend normalization
2019-06-14 13:21:17 +05:30
7f9409bd8e
Checkout and cart page now coupled with cart rules
2019-06-14 12:10:03 +05:30
e9a0588185
discount rule fixes
2019-06-13 22:19:44 +05:30
5afef79ac2
merge with master
2019-06-13 20:24:52 +05:30
1a36cd32c7
change query for min price of variant
2019-06-13 20:22:16 +05:30
6e8c0da054
Fixed conflicts
2019-06-13 19:48:30 +05:30
806f8f71f6
Added discount amount to cart item
2019-06-13 19:34:13 +05:30
abf46c8a99
Added discount amount in cart item table
2019-06-13 19:30:00 +05:30
a27bae1c2d
All assets compiled for production
2019-06-13 19:08:42 +05:30
769f17a196
Fixed some syntax issue in cart rule controller
2019-06-13 19:00:33 +05:30
0aaf3d68e1
Ui package assets compiled for production
2019-06-13 18:20:09 +05:30
7b14de69c6
changes in config & composer
2019-06-13 14:56:04 +05:30
0fc78c5d83
Merge branch 'development' of https://github.com/rahulshukla-webkul/bagisto into development
2019-06-13 14:51:24 +05:30
d2e8e822d7
Fixed issue #1007
2019-06-13 12:51:18 +05:30
6c0ee913ed
added mass actions in admin customers grid
2019-06-13 12:47:58 +05:30
23467d9389
Added message when seller is blocked
2019-06-13 06:37:16 +05:30
c86a699f69
Added status check in customer auth session creation function
2019-06-13 06:34:46 +05:30
619b8b6c8b
Added status and notes in customer model fillables
2019-06-13 06:28:29 +05:30
ec27ed4c8d
added credit max in configuration
2019-06-13 01:05:29 +05:30
4542c96b17
Fixed issue in core regarding buynow button passing static quantity as 1 is now removed
2019-06-12 15:16:06 +05:30
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
6a8c7a8784
assests compile for production
2019-06-11 16:40:13 +05:30
5b1f300abf
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-11 16:22:15 +05:30
1a84a016fa
bulk add to cart
2019-06-11 16:22:01 +05:30
22a81efdb3
fixed issue #1011
2019-06-11 14:51:28 +05:30
6b9be23cb0
fixed issue in cart rule for add condition button and exception while updating cart rule
2019-06-11 14:38:57 +05:30
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
a7592b233d
Fixed bug #1003
2019-06-11 12:26:54 +05:30
64c249983d
Fixed
2019-06-10 18:28:17 +05:30
8b5ac835e0
Fixed bugs in creation of cart rule form
2019-06-10 18:26:12 +05:30
8e37ebe7d5
conflict resolve
2019-06-10 17:13:30 +05:30
80ac7bba72
customer document
2019-06-10 17:11:56 +05:30
e20e29b0bd
Fixed bug in cart rule form
2019-06-10 16:44:39 +05:30
451000c0d5
disabled customer groups from cart rules
2019-06-10 16:41:31 +05:30
0d3539f3c9
fixed validation issues in cart rule #993 & #997
2019-06-10 15:29:19 +05:30
cfb16da64a
fixed issue #994
2019-06-10 15:21:45 +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
66bd3e7989
Optional index for datagrid action
2019-06-07 17:59:38 +05:30
5585b503cf
Car controller updated
2019-06-07 16:36:50 +05:30
ca4d9ef9ba
Fixed js issue buy now button not exist
2019-06-07 15:42:58 +05:30
c6a44b5414
Updated cart for custom_price
2019-06-07 11:18:46 +05:30
87542306a2
Merge pull request #980 from rahulshukla-webkul/development
...
Development
2019-06-07 11:14:43 +05:30
dc96dfb7b2
custom price default to null
2019-06-07 11:12:40 +05:30
f924e7ed01
custom price nullable in cart items
2019-06-07 10:06:00 +05:30
9bb3c2def9
Merge pull request #977 from rahulshukla-webkul/development
...
Development
2019-06-06 17:47:37 +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
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
2d00679901
totalQuantity function added to product and product flat model
2019-06-06 16:43:36 +05:30
af67516c36
object added with event
2019-06-06 15:16:16 +05:30
b7b42ffc15
translation updated
2019-06-04 18:25:54 +05:30
255664c4c0
back button implemented on checkout page
2019-06-04 16:36:42 +05:30
9f039cb9a5
clean up
...
- optimized imports
- remove unused variable
- extract a method
- flatten code
2019-06-04 14:45:16 +04:30
68e01e85c2
Merge pull request #971 from imanghafoori1/clean_up_dashboard
...
Clean up
2019-06-04 14:21:19 +05:30
d232722b5d
issue #916
2019-06-04 12:49:10 +05:30
40e8c85813
issue #945 product image of variant
2019-06-04 10:17:00 +05:30
e0dd74c06c
clean up
2019-06-04 00:52:37 +04:30
93324e021e
issue #896 product special price
2019-06-03 17:11:11 +05:30
fc456c785f
issue #850
2019-06-03 16:29:00 +05:30
4ed068b00b
Merge pull request #967 from jitendra-webkul/jitendra
...
Fixed mini cart layout
2019-05-31 18:31:41 +05:30
96e8556b54
Fixed mini cart layout
2019-05-31 18:30:09 +05:30
fa87ecab3d
Merge pull request #966 from jitendra-webkul/jitendra
...
Issue #932 fixed
2019-05-31 17:54:26 +05:30
8202f58284
Issue #932 fixed
2019-05-31 17:52:52 +05:30
746d7e5204
Merge pull request #965 from rahulshukla-webkul/development
...
Development
2019-05-31 13:20:27 +05:30
12e93b3f58
cart updated for convert price
2019-05-31 12:48:04 +05:30
445b648b0a
Issues #948 , #949 fixed
2019-05-30 18:32:01 +05:30
49d8388d49
Merge pull request #962 from rahulshukla-webkul/development
...
UI fixes for project
2019-05-30 13:25:59 +05:30
3663391bf6
UI fixes for project
2019-05-30 11:52:06 +05:30
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
6804deae76
channel added for payment & shiping method's status
2019-05-29 13:31:53 +05:30
ef2f9659f4
Merge pull request #959 from rahulshukla-webkul/development
...
configuration added to admin logo
2019-05-29 12:45:08 +05:30
573df3818c
configuration added to admin logo
2019-05-29 12:42:18 +05:30
3cec2d1935
Merge pull request #958 from rahulshukla-webkul/development
...
Development
2019-05-29 11:48:55 +05:30
d1199a6f26
issue #956
2019-05-29 11:35:17 +05:30
fe8ac5abf1
issue #957 change in event
2019-05-29 09:56:28 +05:30
eee546da6a
Merge pull request #955 from rahulshukla-webkul/development
...
Development
2019-05-28 17:06:25 +05:30
7281cfeb78
issue #922
2019-05-28 13:32:13 +05:30
b5eff8b47e
issue #942
2019-05-27 18:25:30 +05:30
c4a9d04e72
file & image attribute
2019-05-27 16:51:27 +05:30
37ba923e9e
Backorder implemented
2019-05-24 18:45:47 +05:30
d7c2ef3e6d
Merge pull request #944 from rahulshukla-webkul/development
...
Development
2019-05-24 17:18:17 +05:30
b8561d4d5e
schema condition in product flat table
2019-05-24 12:15:30 +05:30
308b3be1d8
installer file deletion after install
2019-05-24 11:53:11 +05:30
7efcdefc6a
changes in prouduct flat new migration
2019-05-23 18:49:29 +05:30
fb394d974c
Discount calculation added to the cart and discount added to the sales views
2019-05-23 18:44:16 +05:30
edec481f26
Sales discount calculation implemented
2019-05-23 17:00:11 +05:30
de5952bc36
issue #939
2019-05-23 13:06:31 +05:30
8678a865f0
column added in product flat table
2019-05-23 12:10:02 +05:30
2d85b90e81
weight unit added in configuration
2019-05-22 19:40:36 +05:30
27812ccd15
shipping title & footer text
2019-05-22 18:45:47 +05:30
5c6708c975
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-05-22 18:14:57 +05:30
f434024827
change datatype of post code
2019-05-22 17:03:48 +05:30
acfdd0f880
config field for password
2019-05-22 16:11:45 +05:30
698f7da6da
Merge pull request #930 from rahulshukla-webkul/development
...
issue #917 & #923
2019-05-22 12:10:32 +05:30
7888656d4c
down icon & product edit icon
2019-05-21 20:11:36 +05:30
30942b3d25
product page changes
2019-05-21 19:36:20 +05:30
84b60e9081
comment of phone field in customer
2019-05-21 18:07:54 +05:30
d965e10e4b
Merge pull request #931 from jitendra-webkul/jitendra
...
Api added for address delete
2019-05-21 13:04:37 +05:30
64fde804b4
Api added for address delete
2019-05-21 13:03:50 +05:30
568e6ff7c8
change for group
2019-05-21 12:46:43 +05:30
898214e81e
issue #925
2019-05-21 12:00:43 +05:30
2d782cab79
issue #917 & #923
2019-05-21 10:51:39 +05:30
f05d07eb38
issue #913 group in attribute family
2019-05-20 16:22:53 +05:30
afb0b99723
Email sent option added in mail notification
2019-05-17 16:05:30 +05:30
7931baab28
Email sent option added in mail notification
2019-05-17 15:31:39 +05:30
39ae415148
admin Navigation bar menu scroll issue fixed
2019-05-10 11:34:25 +05:30
4455ce6849
Merge pull request #912 from jitendra-webkul/jitendra
...
Refactored ProductController
2019-05-09 16:50:45 +05:30
165e6aef5b
Refactored ProductController
2019-05-09 16:49:52 +05:30
05d3870b06
Merge pull request #911 from jitendra-webkul/jitendra
...
Added url_key to product api
2019-05-09 13:25:50 +05:30
845a6c7f18
Added url_key to product api
2019-05-09 13:24:52 +05:30
6e3769a95e
Merge pull request #910 from rahulshukla-webkul/development
...
icon issue in layred navigation #issue 903
2019-05-09 12:32:55 +05:30
ce99a4d9bb
icon issue in layred navigation #issue 903
2019-05-09 12:28:48 +05:30
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
a9a069f366
Api add to cart error message issue fixed
2019-05-09 12:04:41 +05:30
d31179edaa
removal of space
2019-05-09 11:38:34 +05:30
ae8a4dae61
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-05-09 11:36:51 +05:30
4c2a895b08
Issue #897 & change in valdation message for category image
2019-05-09 11:36:21 +05:30
55c083ae1e
Merge pull request #907 from jitendra-webkul/jitendra
...
Added api for forgot password
2019-05-08 18:57:25 +05:30
16220c656f
Added api for forgot password
2019-05-08 18:56:28 +05:30
3486983b1d
IE completed & redirect customer route
2019-05-08 17:52:54 +05:30
6f494cc04b
IE changes
2019-05-07 21:09:27 +05:30
e2120ea276
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-05-07 18:57:55 +05:30
b52dc978e8
Admin section for IE & dyanamic footer content
2019-05-07 18:57:33 +05:30
0ff492ae80
Fixed product repository search index issue
2019-05-07 17:54:43 +05:30
a72d054cb5
Added api for front shop
2019-05-07 17:06:21 +05:30
b4a95b8d0c
cart pages changes
2019-05-06 21:15:26 +05:30
1b3653348d
front end changes for IE
2019-05-06 20:52:43 +05:30
87b732898d
add & remove at cart page
2019-05-06 13:06:16 +05:30
af8705d8e8
Merge pull request #900 from shenjiayu/development
...
utilise Mail::queue to send emails
2019-05-02 16:52:54 +05:30
6b237b775d
Fixed payment class conflict
2019-05-02 11:00:02 +05:30
6121e5eefe
Added getPaymentMethods in Payment
2019-05-02 10:55:59 +05:30
2816dd01e5
Merge branch 'master' into development
2019-05-01 22:38:42 +10:00
52bc554e31
Merge pull request #895 from prateek-webkul/development
...
admin mail notification, review price
2019-05-01 17:58:12 +05:30
8eea13db2d
utilise Mail::queue to send emails
2019-05-01 21:31:03 +10:00
f942415ebb
sort order for payment methods
2019-04-30 19:02:56 +05:30
db56e4b2df
issue #814
2019-04-30 17:53:59 +05:30
ca08b9a133
rtl css chages for category
2019-04-30 14:48:43 +05:30
46da666ace
issue #767
2019-04-30 13:25:17 +05:30
4c101aa646
admin mail notification, review price
2019-04-30 12:55:11 +05:30
507a41546d
issue #890
2019-04-30 12:40:35 +05:30
f841f16621
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-29 15:51:30 +05:30
cc3323c55d
issue #891 description issue
2019-04-29 15:51:15 +05:30
a57c3e0ba7
Merge pull request #892 from jitendra-webkul/jitendra
...
price issue fixed
2019-04-29 15:42:13 +05:30
5c68618416
price issue fixed
2019-04-29 15:41:31 +05:30
8d64ba656a
option attribute in layred navigation & category changes
2019-04-26 19:06:18 +05:30
2674fbb9ca
issue #850
2019-04-26 15:31:01 +05:30
23431e5083
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-26 12:44:38 +05:30
34aeeac2d0
Merge pull request #884 from jitendra-webkul/jitendra
...
Jitendra
2019-04-26 12:44:24 +05:30
10e92dada3
Now variant's super attributes values are saving in product_flat table
2019-04-26 12:43:42 +05:30
8019f49765
issue #879
2019-04-26 11:18:15 +05:30
5e6131102b
issue #866 & #845
2019-04-25 14:11:49 +05:30
deb209d140
confirm box on delete
2019-04-25 13:05:35 +05:30
c09e000eb9
removal of view from customers service provider
2019-04-24 18:34:26 +05:30
85af8e8402
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-24 17:57:30 +05:30
75e74dfb7e
issue #867 shipment issue
2019-04-24 17:57:16 +05:30
c4c55bc48d
Refactored cart class
2019-04-24 17:09:46 +05:30
55e19c32c5
Merge pull request #873 from rahulshukla-webkul/development
...
issue #865 description
2019-04-24 16:26:37 +05:30
fb15e48c4d
issue #865 description
2019-04-24 16:14:35 +05:30
43a39dc77c
Merge pull request #872 from jitendra-webkul/jitendra
...
Fixed guard spell mistake
2019-04-24 16:06:19 +05:30
28fc43fbfa
Fixed guard spell mistake
2019-04-24 16:05:29 +05:30
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
ee056ee917
Update Cart in order make compatible for api and session guard
2019-04-24 15:55:49 +05:30
1f86376ffe
Merge pull request #870 from jitendra-webkul/jitendra
...
Configurable product add to cart issue fixed
2019-04-24 15:10:30 +05:30
ac03710f07
Configurable product add to cart issue fixed
2019-04-24 15:09:55 +05:30
8b0787ad53
issue #835
2019-04-24 14:45:57 +05:30
423d3d1bbf
issues
2019-04-24 10:48:12 +05:30
c4eb615328
issue #842
2019-04-23 18:53:41 +05:30
e52c426600
dashboard & issue #841
2019-04-23 16:20:33 +05:30
538c4beab0
merge with master
2019-04-23 15:40:06 +05:30
9903d23dfe
change in category menu
2019-04-23 15:38:11 +05:30
7a5c3f1bdc
Assets compiled for production
2019-04-23 12:58:47 +05:30
64ee90f372
Merge pull request #860 from jitendra-webkul/jitendra
...
Created new route for 404 page
2019-04-23 12:44:37 +05:30
b5c762b528
Created new route for 404 page
2019-04-23 12:43:42 +05:30
148ff7c1e8
merge with master
2019-04-23 12:36:05 +05:30
adfc375091
Merge pull request #859 from jitendra-webkul/jitendra
...
Issue #851 fixed
2019-04-23 11:17:25 +05:30
9d65030779
Issue #851 fixed
2019-04-23 11:16:34 +05:30
66b9cec73f
Merge pull request #858 from jitendra-webkul/jitendra
...
Issue #855 fixed
2019-04-23 11:03:48 +05:30
e18fd4e5c4
Issue #855 fixed
2019-04-23 11:03:05 +05:30
025a34d99f
Merge pull request #857 from jitendra-webkul/jitendra
...
Issue #840 fixed
2019-04-23 10:33:58 +05:30
c585186a88
Issue #840 fixed
2019-04-23 10:33:10 +05:30
560d1fb0bc
issue #856
2019-04-22 20:52:36 +05:30
0239b7ec0b
issue #846
2019-04-18 20:22:37 +05:30
148f942c4a
issue #848
2019-04-18 19:15:14 +05:30
600bf55f1f
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-18 17:18:15 +05:30
d2868f6316
Merge pull request #849 from jitendra-webkul/jitendra
...
Fixed urldecode issue in search temm
2019-04-18 17:17:55 +05:30
f9e174ea70
Fixed urldecode issue in search temm
2019-04-18 17:16:36 +05:30
26bd9f4283
issue #845
2019-04-18 17:16:07 +05:30
7cd5bfe445
Merge pull request #847 from jitendra-webkul/jitendra
...
Issue #840 fixed
2019-04-18 15:51:53 +05:30
7e826bef00
Issue #840 fixed
2019-04-18 15:50:03 +05:30
5b01493d26
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-18 13:04:10 +05:30
16b2b2a01f
scroller fixed
2019-04-18 12:58:35 +05:30
580d3ddf65
Resolve conflict
2019-04-18 12:56:36 +05:30
e99daf28e2
Issue #834 fixed
2019-04-18 12:52:51 +05:30
439652699e
issue #836
2019-04-17 19:20:07 +05:30
13ac4a9571
issue #824
2019-04-17 15:21:48 +05:30
58ddc68520
issues
2019-04-17 12:56:33 +05:30
df8f54597a
scroller code removed
2019-04-17 12:30:50 +05:30
eb5bad16ff
removed code for scroller
2019-04-17 12:24:41 +05:30
ad6acfa7e0
issue #824
2019-04-16 20:15:28 +05:30
ae6d498f4c
merge with master
2019-04-16 19:22:49 +05:30
558b416bb6
Merge branch 'development' of https://github.com/prateek-webkul/bagisto into development
2019-04-16 19:22:03 +05:30
3e97bacf91
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-16 19:19:26 +05:30
095c045c58
change table of product datagrid to product_flat
2019-04-16 18:59:29 +05:30
7fc68c56ae
Added product id attribute to model
2019-04-16 16:37:52 +05:30
dd90e63ade
Fixed add to cart issue
2019-04-16 16:32:30 +05:30
1dd23a5a39
Changed varaible name productFlat to product in product card page
2019-04-16 16:02:04 +05:30
4e56374c70
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-16 16:01:37 +05:30
700a2951e6
added related products and up sells to the product view page
2019-04-16 15:57:38 +05:30
a4bb5a036b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-16 15:55:42 +05:30
3984d92fad
Merge pull request #828 from prashant-webkul/development
...
Development
2019-04-16 15:46:32 +05:30
a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
...
Issue #803 fixed
2019-04-16 15:41:39 +05:30
eb00f36835
Issue #803 fixed
2019-04-16 15:40:58 +05:30
d568ea4bbe
merge with master
2019-04-16 15:35:54 +05:30
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
1aa9bf78aa
Removed unforced controller file from attribute package's Repositories directory
2019-04-16 14:41:12 +05:30
af88e8951a
Unnecessary Tax models removed from core, were originally moved from core to Tax module
2019-04-16 14:39:30 +05:30
ca7a5e4a6f
Changed the moduleServiceProvider registration back in concord config file.
2019-04-15 16:37:25 +05:30
36f6c425c2
Assets compiled for production
2019-04-15 15:14:32 +05:30
feaaaa89a5
fixed some style issues
2019-04-14 15:30:43 +05:30
f35e9a48d8
corrected composer.json provider path for UI package
2019-04-13 10:33:23 +05:30
520c21a4cd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-13 10:32:42 +05:30
44c898824e
removed duplicate entry in product linking
2019-04-12 18:43:42 +05:30
3fe8152758
added php tooltip.js dependency and laravel dusk for browser tests profiling
2019-04-12 18:20:33 +05:30
ee889cc259
upgrade code of zoom
2019-04-12 16:40:45 +05:30
1caa3eb4f6
image zoom in rtl
2019-04-12 14:11:05 +05:30
07b6ac6903
limit for up_sell, cross_sell & related product
2019-04-12 13:05:45 +05:30
f1c263805c
issues #815
2019-04-10 16:45:52 +05:30
2a859b7e23
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-10 15:08:15 +05:30
b99b0ad8b5
product attribute & category menu
2019-04-10 15:08:01 +05:30
ebc0befe6a
Merge pull request #813 from naresh-webkul/development
...
Development
2019-04-10 13:25:43 +05:30
d1e38fe83b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-10 12:12:15 +05:30
f3f61e3c91
Optimized performance
2019-04-10 12:10:46 +05:30
4f999ee34a
changed shipment table content
2019-04-09 19:40:43 +05:30
f2def6c4bc
scroller issue fixed
2019-04-09 19:28:44 +05:30
ab4c054292
changed shipment table
2019-04-09 18:52:44 +05:30
b6a1a05e66
added permission of add & delete in acl
2019-04-09 18:52:03 +05:30
e5d71fa280
change in jquery for wishlist icon for zoom
2019-04-09 17:59:58 +05:30
b0296a02e0
inventory source mail
2019-04-09 17:04:20 +05:30
fb6ffaa9d9
JWT implemented for customer api authorization
2019-04-09 16:27:33 +05:30
5e15e05c78
tax category message change
2019-04-09 16:15:04 +05:30
7678593bd4
Merge pull request #812 from rahulshukla-webkul/development
...
Development
2019-04-09 15:52:46 +05:30
6a7f247d7a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-09 15:30:52 +05:30
6b247993e4
Theme finder issue fixed (Shop changes was reflecting in admin)
2019-04-09 15:22:45 +05:30
a3999d7a23
merge with master
2019-04-09 15:13:26 +05:30
9d89ec816d
comment, variable name changes
2019-04-09 14:17:18 +05:30
09aa34b36a
issue #749 fixed again & reduce query
2019-04-09 14:05:57 +05:30
1ec1c5d83c
fixed some bugs
2019-04-09 13:29:31 +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
8e7c3c7f22
restore migration
2019-04-09 12:12:35 +05:30
dbde05e0cd
change in delete query
2019-04-09 12:05:52 +05:30
09d6afc72a
Implemented customer configuration based features:
...
1. Email Verification.
2. Email Subscription.
2019-04-09 08:03:31 +05:30
6c74b2ca42
admin assets compiled for production
2019-04-09 06:33:36 +05:30
6a4cb016c4
fixed issue #750
2019-04-09 06:31:52 +05:30
d8d645eb41
fixing csrf issue for datagrid delete
2019-04-08 20:26:04 +05:30
2df1a84191
Security fix underway need pull from other branches
2019-04-08 19:46:19 +05:30
efd38ab99e
issue #718
2019-04-08 19:33:23 +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
82e56334c2
Fixed modal style issues, localization of routes issue and updated description string of version command
2019-04-07 06:30:55 +05:30
c7482f576e
Some styles fixes on auth pages of customer and footer bottom
2019-04-07 03:44:18 +05:30
1033bd8d31
Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development
2019-04-06 02:23:12 +05:30
8cfcf3d484
order view for customer fixed
2019-04-06 02:18:31 +05:30
61fd02ed57
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-05 19:38:56 +05:30
1e6579bedf
in fix
2019-04-05 19:38:44 +05:30
28c45c9bfa
issue #802
2019-04-05 19:29:04 +05:30
91477e50c0
issue #802 sqllite
2019-04-05 19:19:10 +05:30
ee189baf7a
merge with master
2019-04-05 16:55:09 +05:30
fdb6284856
issue #760 wishlist
2019-04-05 16:54:09 +05:30
e88bf10c55
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-05 12:00:10 +05:30
e83a27a31b
Issue #803 fixed
2019-04-05 11:42:52 +05:30
89613136ff
Merge pull request #795 from imanghafoori1/flatten_code
...
flatten code
2019-04-05 11:10:49 +05:30
dadbf2bd6a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-05 10:47:16 +05:30
380f265ef1
H tag font sizes fix
2019-04-05 10:46:57 +05:30
ca93e36826
flatten code
2019-04-04 23:53:59 +04:30
07806c44fc
flatten code
2019-04-04 23:51:33 +04:30
4c2a0a08fc
email subscription & newsletter verifiaction
2019-04-04 19:34:01 +05:30
7be61550a4
change in query for muliselect attribute & layered navigation
2019-04-04 19:11:32 +05:30
e0ab120b9b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-04 15:44:17 +05:30
9c8f4f9522
issue #799 multiselect attribute & layered navigation
2019-04-04 15:43:33 +05:30
5c94a8a21f
changed name of folder from 'sass' to 'scss' inside packages Admin, Shop & Ui
2019-04-04 14:50:59 +05:30
d18b862f85
Merge pull request #796 from imanghafoori1/fix_docblocks
...
fix docblocks
2019-04-04 12:07:55 +05:30
8ac9c7b8ba
Merge pull request #793 from prateek-webkul/development
...
issue fixed #791
2019-04-04 11:56:34 +05:30
56933912eb
fix docblocks
2019-04-03 18:13:59 +03:30
2daf56c4fd
refactor using ::class
2019-04-03 17:24:45 +03:30
504a5ec038
issue fixed #791
2019-04-03 18:03:11 +05:30
1cb03f9ac3
admin scroller bug fixed
2019-04-03 15:23:12 +05:30
3dee0678f7
Merge pull request #788 from imanghafoori1/flatten_foreach
...
flatten code
2019-04-03 14:49:22 +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
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
b655a848d7
admin scroller bug fixed
2019-04-03 12:17:23 +05:30
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
fadd26bd13
flatten code
2019-04-02 22:10:34 +03:30
14cd4eb97e
flatten code
2019-04-02 21:50:44 +03:30
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
1492022c20
fixed syntax for PR #784
2019-04-02 18:24:43 +05:30
896b4eebc3
scroller
2019-04-02 18:07:54 +05:30
594d4598a5
scroller
2019-04-02 18:03:12 +05:30
e0fc65b0da
admin nav left menu scroll bug fixed
2019-04-02 17:57:34 +05:30
39acb0de43
merge with master
2019-04-02 13:26:39 +05:30
9e58602262
issue #758
2019-04-02 13:24:11 +05:30
rahul shukla
Jitendra Singh
Daniel Pinon
Prashant Singh
jitendra
prateek srivastava
Jyoti Singh
Prashant Singh
imanghafoori
shaiv-webkul
Jiayu Shen
shenjiayu
naresh verma
rahulshukla-webkul
Prateek Srivastava