Prashant Singh
d8086091cb
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-07-30 13:54:25 +05:30
Prashant Singh
a5def0aa13
Updated Stripe Connexct
2019-07-30 13:53:50 +05:30
rahul shukla
39139f26ca
Issues #1228 and #1229
2019-07-30 13:45:13 +05:30
Jitendra Singh
9a211adaa4
Merge pull request #1207 from ArmCM/refactor/code_style
...
WIP - fix code style laravel
2019-07-30 11:49:27 +05:30
Jitendra Singh
41510db280
Merge pull request #1202 from moe2566/master
...
Add text direction configuration for locales
2019-07-30 11:48:56 +05:30
rahul shukla
c73e12a052
try, catch for password reset. issue #1177
2019-07-30 10:50:05 +05:30
rahul shukla
1b95d3d877
product creation on channel based and admin logo
2019-07-30 10:36:26 +05:30
rahul shukla
b39f412842
issue #1217 , #1220 and #1218
2019-07-29 14:44:38 +05:30
rahul shukla
d83396d437
issue #1217 , #1220 and #1218
2019-07-29 14:38:17 +05:30
rahul shukla
2e336c935a
test field added for depandenet field in configuaration
2019-07-29 14:34:54 +05:30
rahul shukla
9d9b0b5176
use in product flat column added in attributes
2019-07-29 14:33:33 +05:30
rahul shukla
dbff16b8b7
disabale zoom on mobile devices
2019-07-29 12:07:39 +05:30
Prashant Singh
f9e91bb0ef
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-07-25 11:26:34 +05:30
rahul shukla
fca1d6d15c
filter code updated
2019-07-25 11:11:18 +05:30
moe2566
09cfa77378
Update anonymous-master.blade.php
2019-07-24 10:19:50 -04:00
Prashant Singh
1a3038ae72
New cart rule actions
2019-07-24 19:32:37 +05:30
rahul shukla
13a982f480
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-24 18:51:03 +05:30
rahul shukla
29763b902e
issue of image at checkout #1209
2019-07-24 18:50:44 +05:30
rahul shukla
1dd5faa21d
change Datatype for code
2019-07-24 17:55:32 +05:30
ArmCM
ae6c6fa193
WIP - fix code style laravel
2019-07-24 02:50:22 -05:00
Jitendra Singh
871bc8c190
Merge pull request #1205 from rahulshukla-webkul/development
...
assests compile for production
2019-07-24 12:39:48 +05:30
rahul shukla
97320b52ea
assests compile for production
2019-07-24 10:40:51 +05:30
moe2566
e038416f55
Update 2019_07_23_033128_alter_locales_table.php
2019-07-23 19:22:03 -04:00
Moshe Lustigman
a0ba845e37
Add text direction configuration for locales
2019-07-23 18:05:57 -04:00
Hans Schouten
cfb4b8d682
Fix firing the wrong event after storing user
2019-07-23 21:59:28 +02:00
Prashant Singh
45ce843772
Cart rule new actions implementation
2019-07-23 18:23:49 +05:30
rahul shukla
cff63acfc8
reverting changes
2019-07-23 17:49:24 +05:30
rahul shukla
9cd9846d65
set locale on session if not available
2019-07-23 17:47:19 +05:30
rahul shukla
f4eb973ba6
reduces number of loop for filter attribute #1192
2019-07-23 15:57:49 +05:30
Prashant Singh
2acad0e540
Fixed an issue with convertXToProductId which was causing some productids from being pushed into the storage
2019-07-23 13:43:37 +05:30
Prashant Singh
dfd6ea8c25
Translations fixes in promotions sections
2019-07-23 13:07:22 +05:30
rahul shukla
bcd84d9e7f
corrction in route
2019-07-23 12:04:09 +05:30
Prashant Singh
70267e29cb
disabled catalog rule
2019-07-22 13:01:54 +05:30
Prashant Singh
0bd422db97
translation fixes in cart rule forms
2019-07-22 13:01:07 +05:30
Prashant Singh
9cf1ea2516
disabled catalog rule till final migrations
2019-07-22 12:54:46 +05:30
Prashant Singh
896cbfe1e0
base sync
2019-07-22 12:53:51 +05:30
Prashant Singh
27ca4cb622
Minor fixes
2019-07-22 12:50:06 +05:30
Prashant Singh
38e029463e
transition of cart rule from old method is now complete, now need to verify actions
2019-07-22 12:44:40 +05:30
Prashant Singh
f8da943cea
Removed a bug when attribute conditions applied with cart rule were not allowing the rule to get applied
2019-07-22 12:35:36 +05:30
Prashant Singh
7f3ed81554
Removed a bug from convertXToProductId from cart rule edit form causing it to exception when no criteria for products to be applied is done emtpy after having a previous criteria
2019-07-22 12:18:59 +05:30
Prashant Singh
38c5a115db
Updated actions for cart rules with couple of new actions
2019-07-19 19:26:33 +05:30
rahul shukla
ef5eb1356c
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-19 16:30:28 +05:30
rahul shukla
3200cbafc6
Issue #1190 .
2019-07-19 16:30:01 +05:30
Prashant Singh
85865ba939
Eliminated discount configuration
2019-07-19 15:47:01 +05:30
Prashant Singh
bcdec8ec5a
Removed old migrations of catalog rule and removed a bug in convertXToProductId
2019-07-19 15:44:15 +05:30
Prashant Singh
a9994a3143
Translation issue fixes for cart rule create and edit forms
2019-07-19 10:49:19 +05:30
Prashant Singh
f68428ca4d
Fixed a bug in convertXToProductId when attribute result was empty it was throwing exception
2019-07-19 10:20:39 +05:30
Prashant Singh
48d068d760
ConvertXToProductID bug fix when left null
2019-07-18 18:20:21 +05:30
Prashant Singh
750842b2a9
ConvertXToProductId implemented now removal duplicated productIds left
2019-07-18 17:38:09 +05:30
Prashant Singh
4ba8498a1e
updated migration
2019-07-18 17:18:06 +05:30
Prashant Singh
02155d9d6d
Fixed the issue with customer groups
2019-07-18 17:13:48 +05:30
Prashant Singh
b512666ef1
ConvertXToProductId from attributes implemented
2019-07-18 14:08:36 +05:30
rahul shukla
383e782d3c
route correction for customer after login
2019-07-18 13:10:10 +05:30
rahul shukla
f61554c5a6
configuration changes for dependent field
2019-07-18 12:51:22 +05:30
Prashant Singh
247b662b7e
Position fixes for buttons used in tabbed forms
2019-07-18 10:45:59 +05:30
Prashant Singh
52e3a64380
Made all submit buttons of create and update buttons style to fixed
2019-07-18 10:10:49 +05:30
Prashant Singh
2a9b4220d6
Only finding product ids is left then apply them on cart rules
2019-07-17 18:54:43 +05:30
Arpad
4a941e461c
Forget password notification Subject translation
2019-07-17 14:36:00 +02:00
Prashant Singh
3d53a221ef
Has options check applied on frontend for options related to select and multiselect attributes
2019-07-17 16:18:10 +05:30
Prashant Singh
4017e3b16e
ConvertXToProductId frontend complete now moving to converting X to ids
2019-07-17 16:14:04 +05:30
Arpad
2c3467e611
Forgot password back link translation
2019-07-17 09:30:36 +02:00
Prashant Singh
08f606c099
Worked on ConvertXToProductId and the bug in multiselect caused a huge delay but right now we have falled back to old select box
2019-07-16 19:02:40 +05:30
Prashant Singh
6ba5e0df0a
Added back catalog rule migration, a bug is stuck in convert x to productid migrations
2019-07-15 19:54:38 +05:30
Prashant Singh
93a035b147
Fixer io disabled temporarily
2019-07-15 18:25:14 +05:30
Prashant Singh
c6bc5ba1c3
Added support for fixer for fetching rates
2019-07-15 18:24:36 +05:30
rahul shukla
27d6e8894c
checkbox type attribute
2019-07-15 18:00:56 +05:30
rahul shukla
1ec288a182
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-15 17:04:10 +05:30
rahul shukla
67bb7704e7
merge with master
2019-07-15 17:03:54 +05:30
Prashant Singh
7952253e18
Applied a fix for a bug related to shipping modules creating problem when being used with cart rules
2019-07-15 16:04:25 +05:30
Prashant Singh
9f9e0b6a68
Created a command to activate the usage of catalog rule
2019-07-15 16:02:39 +05:30
Prashant Singh
2a6e43de28
Part of convertxtoid frontend complete in cart rule create form, fixed sort order for catalog in admin panel
2019-07-15 14:11:00 +05:30
Prashant Singh
0b29f29022
Added property in customers model to check if the email exists or not
2019-07-15 12:46:33 +05:30
Alexey
5856d00e4b
Update search.blade.php
...
Use TOTAL instead of COUNT
2019-07-14 17:27:34 +04:00
Prashant Singh
0d0a588c33
added products subselection in cart rules create page(in progress 50% done)
2019-07-14 17:20:09 +05:30
Prashant Singh
d860466dfc
mass action index now totally dependent on datagrid's index property
2019-07-14 14:30:44 +05:30
Prashant Singh
f8a4f1ba1c
product card hover transition applied and reduced hover padding by 33%
2019-07-14 12:38:15 +05:30
Prashant Singh
caf165d06c
Fixed issue with image of product card getting cropped due to CSS
2019-07-14 12:25:57 +05:30
Prashant Singh
42d067c44a
Optimization in exception handling for separate admin and shop providers, whilst convertxtoproductid is in UI development
2019-07-14 07:30:16 +05:30
Prashant Singh
5f08f2b9f4
Fixed sort order for configuration in admin panel
2019-07-14 00:46:33 +05:30
Prashant Singh
f8c774b3a5
Started with convert x to product id for cart rules
2019-07-13 15:23:27 +05:30
rahul shukla
78d44a8be0
rtl css for slider
2019-07-11 19:53:18 +05:30
rahul shukla
20a205deba
locale id in cstegory trnaslation
2019-07-11 19:45:48 +05:30
jitendra
3d527d6aba
Updated
2019-07-11 15:05:07 +05:30
Prashant Singh
7ffbee95ad
Shipping methods and payment methods description converted to translation string
2019-07-11 10:16:58 +05:30
Prashant Singh
88611c9d84
Fixed issue #1172
2019-07-11 09:49:32 +05:30
Prashant Singh
abd3913d45
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-10 10:37:29 +05:30
Prashant Singh
457a26176d
fixed issues and uploaded logo of client
2019-07-09 15:54:00 +05:30
Prashant Singh
5a8679b170
SAASPreorder blade files publish enabled for product card
2019-07-09 15:25:38 +05:30
rahul shukla
cc4dfcad76
issue #1160 , filterable attribute & configuration updated for validation
2019-07-09 14:47:40 +05:30
Prashant Singh
6afef120b9
Show price after login translation fixed
2019-07-09 13:14:42 +05:30
Prashant Singh
68bba4d7e2
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-07-09 12:54:42 +05:30
Prashant Singh
316ec39aaf
Configuration field changes done, data-vv-as parameter now take translated attribute from field configuration key called title
2019-07-09 11:18:02 +05:30
Prashant Singh
869265e7a5
Fixed the bug is system core configuration preventing to take null values inn the select and multi select fields
2019-07-09 10:11:19 +05:30
Prashant Singh
e41ac8c144
Added excluded sites configuration to exclude subdomains from company registration
2019-07-08 17:20:28 +05:30
Prashant Singh
458fd9166f
Fixed exception handling in SAASCustomizer
2019-07-08 17:15:27 +05:30
rahul shukla
f9e9dfbae1
slider delete issue
2019-07-08 17:10:42 +05:30
rahul shukla
6fec08f814
check updated, issue #1162
2019-07-08 15:45:15 +05:30
rahul shukla
3511c08e46
issue #1062
2019-07-08 15:38:05 +05:30
rahul shukla
79d25c7d2e
issue #1060
2019-07-08 15:09:42 +05:30
Prashant Singh
223bef7c72
Removed stripe connect dependencies from SAASCustomizer package
2019-07-08 13:29:07 +05:30
rahul shukla
746a17dcf6
conflict resolve
2019-07-08 13:13:34 +05:30
rahul shukla
c7add7e2fe
removal of excess code in search, locale & currency
2019-07-08 13:10:41 +05:30
Jitendra Singh
2c45ddee13
Merge pull request #1157 from danielpinon/patch-1
...
Updating translations of languages in pt_BR
2019-07-08 12:13:54 +05:30
Daniel Pinon
723f6ad639
Clearing duplicity
2019-07-06 23:59:59 -03:00
Daniel Pinon
c5fe78014c
Updating translations of languages in pt_BR
2019-07-06 23:58:01 -03:00
Prashant Singh
8c19d9e0ce
removed dead code
2019-07-06 17:47:45 +05:30
Prashant Singh
c8e8df1699
Added configuration for cart rules
2019-07-06 17:41:58 +05:30
rahul shukla
54481ebbfe
slider edit issue
2019-07-05 18:15:22 +05:30
rahul shukla
2f2f97a6d0
category check condition for sorting
2019-07-05 13:33:06 +05:30
rahul shukla
f9863f440f
category check condition for sorting
2019-07-05 13:24:46 +05:30
Prashant Singh
3fe220428c
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-05 13:23:56 +05:30
jitendra
1592c9e37f
Fixed downloadable issues with locale change
2019-07-05 11:52:14 +05:30
jitendra
1fd25cfc92
Added currency symbol in currencies table
2019-07-05 11:46:45 +05:30
Prashant Singh
e33a374e67
Shop package views reste
2019-07-05 11:18:11 +05:30
Prashant Singh
bb182972f8
Fixed issue #83
2019-07-04 18:20:49 +05:30
Prashant Singh
6cb1f0f699
Fixed a bug in SAAS module core
2019-07-04 16:01:04 +05:30
Prashant Singh
65df13c545
Fixed a bug related to rul parameter
2019-07-04 15:57:13 +05:30
Prashant Singh
c3622fa53b
Fixed bug related to preorder
2019-07-04 14:29:49 +05:30
rahul shukla
cfaee2f432
issue #1147
2019-07-04 13:56:18 +05:30
Prashant Singh
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
rahul shukla
9eb4b89344
json removed
2019-07-04 13:25:08 +05:30
rahul shukla
44a72db99e
maximum price according to category
2019-07-04 13:20:21 +05:30
rahul shukla
60435b724f
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-04 12:38:36 +05:30
rahul shukla
c56d94f7a4
issue #968 and dependent field
2019-07-04 12:38:20 +05:30
Prashant Singh
fdd3ff8779
Fixed issue with stripe
2019-07-03 18:51:35 +05:30
Prashant Singh
b868887ccc
Fixed preorder bug
2019-07-03 18:16:07 +05:30
Prashant Singh
80ea917581
Shop package view reset
2019-07-03 15:24:25 +05:30
jitendra
a514ad5c02
Added jwt service provider to app.php
2019-07-03 15:16:06 +05:30
Prashant Singh
7053a425c2
Fixed issue #76
2019-07-03 15:12:29 +05:30
Prashant Singh
3d552b79fe
A small bug fix in shop price after login
2019-07-03 14:01:24 +05:30
Prashant Singh
5b3bde0d3a
Fixed issue with customer document #74
2019-07-03 13:35:27 +05:30
Prashant Singh
f8d38e9bbd
Enabled usage parameters of cart rule in create and edit form
2019-07-03 11:37:09 +05:30
Prashant Singh
dfc0941fe4
Added the purge pool configuration file in the saas module
2019-07-03 10:56:04 +05:30
Prashant Singh
42c2f07dbc
Actual resource tree formed
2019-07-03 10:21:05 +05:30
Prashant Singh
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
jitendra
31b6e779d6
Fixed image wrapper css issue
2019-07-02 17:55:56 +05:30
jitendra
f3d3dcd733
Now product types can have additional form validations
2019-07-02 16:59:47 +05:30
jitendra
1fb5d9b1fc
Removed unnecessary classed from product types
2019-07-02 14:44:07 +05:30
Prashant Singh
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
Prashant Singh
46d1ec1fc9
Over ride of summary.blade.php according to stripe connect done
2019-07-02 14:15:32 +05:30
Prashant Singh
9276a695b6
Some fixes in stripe
2019-07-02 14:09:26 +05:30
Prashant Singh
9042757f4f
Updated the get root categories method inside category repository class
2019-07-02 13:04:14 +05:30
Prashant Singh
12c321e80e
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-02 12:45:59 +05:30
Prashant Singh
bfe52a7d3c
Enabling coupon usage option for cart rules and start of the program convertxtoproductid
2019-07-02 12:45:30 +05:30
jitendra
f529a128cd
Removed unnecessary code from sevice providers
2019-07-01 20:03:16 +05:30
jitendra
318857b785
Now images will be deleted too if the model gets deleted
2019-07-01 19:42:12 +05:30
prateek srivastava
0e0cd7237a
change in Get root category
2019-07-01 18:07:43 +05:30
jitendra
b7d346260a
Resolve conflicts
2019-07-01 17:12:44 +05:30
jitendra
366a5fdd20
Refactor code standard
2019-07-01 17:03:36 +05:30
Prashant Singh
350ffb1fa9
Fixes in preorder
2019-06-29 20:41:15 +05:30
Prashant Singh
07e90ae0f4
git add .
2019-06-29 20:40:28 +05:30
Prashant Singh
1c1dc3c834
fixed issue with preorder button not coming on storefront
2019-06-29 19:34:04 +05:30
Prashant Singh
170377509c
Fixed search issue in preorder datagrid
2019-06-29 19:21:18 +05:30
Prashant Singh
3d352b690a
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-29 18:49:08 +05:30
Jitendra Singh
e9608d87ef
Merge pull request #1143 from prashant-webkul/development
...
Development
2019-06-29 18:49:00 +05:30
Prashant Singh
e0bbae7f8a
Try catch handler in move to cart from wishlist
2019-06-29 18:47:22 +05:30
Prashant Singh
be2b55a898
fixed event fire on movetocart from wishlist
2019-06-29 18:44:23 +05:30
Prashant Singh
e7e9c24451
Preorder path fixes after updation
2019-06-29 18:35:27 +05:30
Prashant Singh
da29f58531
Publishing for frontend files stopped for preorder and show price after login
2019-06-29 18:20:49 +05:30
Prashant Singh
1057cd654e
Updated preorder in SAAS
2019-06-29 18:19:39 +05:30
Jitendra Singh
337c45426f
Merge pull request #1142 from rahulshukla-webkul/development
...
style for dashboard
2019-06-29 18:16:39 +05:30
Prashant Singh
1b43e9c253
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-29 18:14:42 +05:30
rahul shukla
2f905203a2
style for dashboard
2019-06-29 18:12:07 +05:30
jitendra
f08a8036e6
Resolved conflict
2019-06-29 17:57:10 +05:30
jitendra
3ef416b22e
Added downloadable order item info
2019-06-29 17:51:49 +05:30
Jitendra Singh
842a0f77d4
Merge pull request #1141 from prashant-webkul/development
...
Added cart item add before event
2019-06-29 17:50:14 +05:30
Prashant Singh
e3bc993c99
Added cart item add before event
2019-06-29 17:24:41 +05:30
Prashant Singh
8155637f39
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-29 17:10:05 +05:30
Jitendra Singh
44af368b9c
Merge pull request #1139 from rahulshukla-webkul/development
...
css changes for overflow
2019-06-29 17:09:32 +05:30
Jitendra Singh
77af67ffd1
Merge pull request #1140 from prashant-webkul/development
...
Development
2019-06-29 17:09:19 +05:30
Prashant Singh
ec2baa1be9
bug fix for event fire
2019-06-29 17:07:19 +05:30
Prashant Singh
ff863fcc54
Added cart item add after event for move to cart from wishlist
2019-06-29 17:04:18 +05:30
Prashant Singh
3d02016db4
Customer document icon applied
2019-06-29 16:27:07 +05:30
Prashant Singh
4e8b5d875c
Updated credit max
2019-06-29 16:02:03 +05:30
Prashant Singh
15690a1f0d
Company id check removed from admins
2019-06-29 15:56:13 +05:30
Prashant Singh
8ef75d2be7
Fixed bug with admins user was coming in check with current company
2019-06-29 15:54:35 +05:30
Prashant Singh
67c3eeb25e
customer document bug fix
2019-06-29 15:46:10 +05:30
Prashant Singh
76742eff85
Customer documents bug fix
2019-06-29 15:41:57 +05:30
rahul shukla
b8c0f4aed6
css changes for overflow
2019-06-29 15:26:26 +05:30
jitendra
ad6e422fdb
Added downloadable and virtual products
2019-06-29 15:23:34 +05:30
Prashant Singh
6c003f949f
Company check implemented in customer document module
2019-06-29 15:21:53 +05:30
Prashant Singh
d164178609
Fixed a stripe transaction fee view bug in shop bundle
2019-06-29 14:52:15 +05:30
Prashant Singh
82db366587
Updated bulk add to cart and customer document
2019-06-29 14:46:42 +05:30
Prashant Singh
930788212d
Added preorder in acl
2019-06-29 12:53:28 +05:30
Prashant Singh
f010b80cc2
Added StripeConnect and Customer Document in acl configuration
2019-06-29 12:50:57 +05:30
Prashant Singh
37409709ce
Fixed dashboard arrow icon issue
2019-06-29 12:14:50 +05:30
Prashant Singh
edc53c90f9
Fixed channel root category issue
2019-06-29 12:11:35 +05:30
Prashant Singh
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
Prashant Singh
04462c7212
Customer document updated
2019-06-29 11:40:58 +05:30
Prashant Singh
d891fb108c
Stripe Icon Added
2019-06-29 11:34:11 +05:30
Prashant Singh
51f0eec908
Added column in preorder datagrid and corrected the spelling in customer document
2019-06-29 11:05:58 +05:30
jitendra
55b71e1e66
updated
2019-06-28 19:48:52 +05:30
Prashant Singh
c217598843
Ignored customer documents table from DBManager
2019-06-28 18:28:49 +05:30
Prashant Singh
f6f06d7a40
Updated credit max module
2019-06-28 17:22:17 +05:30
rahul shukla
e6c20fa11e
table in email template
2019-06-28 17:20:47 +05:30
Prashant Singh
b00374fa81
Updated preorder package for customization
2019-06-28 17:20:19 +05:30
rahul shukla
34fd4e3840
assets compile for production
2019-06-28 17:11:26 +05:30
rahul shukla
8e9768f947
assets compile for production
2019-06-28 17:08:30 +05:30
rahul shukla
d5b66ebf9e
table in email template
2019-06-28 17:05:08 +05:30
Prashant Singh
baf104509b
Updated the customer document module
2019-06-28 17:01:00 +05:30
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