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
ba10a19319
Merge pull request #781 from prashant-webkul/development
...
fixed issue #765
2019-04-02 13:14:07 +05:30
f9cdc21066
fixed issue #765
2019-04-02 13:06:13 +05:30
09dbdb3fea
Merge pull request #776 from imanghafoori1/master
...
Flattened the code
2019-04-02 11:42:44 +05:30
2493b9e614
Provided amend in issue #705
2019-04-02 11:36:33 +05:30
80743dc19b
fixed issue #705
2019-04-02 11:34:45 +05:30
95ea54d220
Merge pull request #779 from prashant-webkul/development
...
Fixed issue #775
2019-04-02 10:27:43 +05:30
9c55f5037d
Fixed issue #775
2019-04-02 09:39:43 +05:30
a84b81f446
flatten code
2019-04-01 18:39:15 +03:30
1a4c040894
remove unused code
2019-04-01 18:38:18 +03:30
56142bf3d8
issue #759
2019-04-01 20:00:54 +05:30
84d4992944
issue #757
2019-04-01 18:06:16 +05:30
5a41b57793
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-01 17:17:51 +05:30
037126f82a
issue #757
2019-04-01 17:17:26 +05:30
0bd03c2c62
Merge pull request #769 from cagartner/feature/add-id-streetlines
...
Added id attribute to streetlines
2019-04-01 15:15:24 +05:30
06aa4dd6bf
Fixed issue #749 for all customer resources profile, wishlist, reviews, orders and addresses
2019-04-01 12:45:56 +05:30
40ebb3a0c4
Fixed issue #749 for all customer resources profile, wishlist, reviews, orders and addresses
2019-04-01 12:43:44 +05:30
4a2efc8eee
fixed issue #749
2019-04-01 01:32:58 +05:30
b8d78ab00d
Added id attribute to streetlines
2019-03-31 15:35:07 -03:00
91b4d1f955
fixed issue #761
2019-03-31 23:37:50 +05:30
0e1f26e835
fixed issue #763
2019-03-31 22:56:30 +05:30
ea99fc8c68
fixed issue 764
2019-03-31 22:41:14 +05:30
1d372621ce
Security fix for customer information and fixed issue #762
2019-03-30 18:55:10 +05:30
8af43eb5cc
session expiration time now changed to 10 minutes to counter XSRF requests
2019-03-30 18:14:54 +05:30
5346312ad0
revising issue #705
2019-03-30 16:50:53 +05:30
fc3c1a468b
fixed issue #705
2019-03-30 16:44:21 +05:30
257dfc8b1e
rtl css for product list & currency capital
2019-03-29 16:48:00 +05:30
8897a27499
issue #730
2019-03-29 13:11:49 +05:30
12a8a91476
issue #727
2019-03-29 10:24:22 +05:30
68bb6a6149
issue #706
2019-03-28 20:20:00 +05:30
fef1b2d8da
Fixing of 3rd level menu issue for custom roles #705
2019-03-28 18:09:29 +05:30
d4c58724ae
issue #728
2019-03-28 15:36:48 +05:30
fb6b4a13f1
issue #738
2019-03-28 14:29:45 +05:30
0002f7caaa
issue #736
2019-03-28 12:50:00 +05:30
034deb05fc
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-28 10:35:24 +05:30
179ac647d8
variable name change
2019-03-28 10:14:36 +05:30
23fe05e192
issue #742
2019-03-28 10:10:26 +05:30
fa0a3ee4ee
issue #706
2019-03-27 20:13:43 +05:30
c2f24d47cb
merge with master
2019-03-27 14:26:52 +05:30
a3b9ef427e
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-27 14:25:21 +05:30
abf563ced1
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-27 09:29:38 +05:30
5a2a3c1988
Merge pull request #744 from cagartner/feature/default-laravel-translations
...
Created default laravel translation for pt_BR
2019-03-27 09:10:16 +05:30
cbfe9a53dd
Created default laravel translation for pt_BR
2019-03-26 15:17:45 -03:00
e9b511a92a
probable solution for 3 level menu bug
2019-03-26 16:00:37 +05:30
d4d93739dc
product zoom functionality added
2019-03-25 16:32:13 +05:30
54d2a000c8
Fixing some issues and probably solving later
2019-03-25 15:59:37 +05:30
2a57530184
issue #735 & minor config changes for select
2019-03-22 14:54:46 +05:30
e41445e802
issues #729 and #731
2019-03-22 12:54:38 +05:30
e052276907
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-22 11:58:28 +05:30
dca138ae85
issue #724
2019-03-22 11:58:11 +05:30
dc08bbc06e
installer issue
2019-03-20 15:09:24 +05:30
c84e76646e
Fixed issue #720
2019-03-20 10:13:27 +05:30
b4c7bc550c
Fixed issue #712
2019-03-20 09:39:49 +05:30
8d486f336c
Fixed issue #708
2019-03-20 09:34:08 +05:30
8b85452097
changed the add to buttons in bagisto
2019-03-19 18:18:59 +05:30
b59c25bfb8
Bug fix
2019-03-19 16:19:41 +05:30
7ad8d567b1
Arabic translations added
2019-03-19 14:28:35 +05:30
2b17cdb7fd
fixed issue #713
2019-03-19 13:24:28 +05:30
97da404216
default channel now getting checked with admin
2019-03-19 13:22:06 +05:30
7a0d470c20
Merge pull request #715 from rahulshukla-webkul/development
...
Development
2019-03-19 12:17:06 +05:30
a34a2f2ba4
Merge pull request #714 from prashant-webkul/development
...
Development
2019-03-19 12:16:54 +05:30
40a0fa8cb0
Fixed issues #710 #709
2019-03-19 12:13:17 +05:30
a9d1794547
changes in cross sell
2019-03-18 19:01:10 +05:30
f54f8989dc
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-18 16:36:00 +05:30
10f40c90ec
strict mode error
2019-03-18 16:35:41 +05:30
41217e525f
Assets compiled for production
2019-03-15 19:31:23 +05:30
947c1ab526
Merge pull request #702 from jitendra-webkul/jitendra
...
Jitendra
2019-03-15 19:07:55 +05:30
94dfe8dc69
Fixed resource controller issue
2019-03-15 19:00:44 +05:30
2123260387
Added formated price key in product api
2019-03-15 18:48:51 +05:30
a222b221bf
Merge pull request #701 from jitendra-webkul/jitendra
...
Jitendra
2019-03-15 17:57:58 +05:30
ef988b093f
Product base image property added in prodcut api
2019-03-15 17:47:54 +05:30
0a4fd97a0c
fixed issues with rtl
2019-03-15 17:14:13 +05:30
8b430988c4
assets compiled for production
2019-03-15 16:46:02 +05:30
d4f292490b
more probable solution for admin menu scrolling
2019-03-15 13:28:55 +05:30
1759392af5
Merge pull request #698 from jitendra-webkul/jitendra
...
Category display mode feature added
2019-03-15 13:09:19 +05:30
2e9f58917f
Category display mode feature added
2019-03-15 13:08:21 +05:30
b615303003
Merge pull request #697 from jitendra-webkul/jitendra
...
Category Repository issue fixed
2019-03-15 12:01:17 +05:30
340b621b1a
Category Repository issue fixed
2019-03-15 12:00:33 +05:30
c23343377f
Merge pull request #696 from jitendra-webkul/jitendra
...
Sorting added in ResourceController
2019-03-15 10:37:20 +05:30
4ca1095265
Sorting added in ResourceController
2019-03-15 10:36:27 +05:30
c19e062cfd
Merge pull request #695 from jitendra-webkul/jitendra
...
Added getCurrentLocale function in Core.php
2019-03-14 18:24:40 +05:30
218ef7a85f
Added getCurrentLocale function in Core.php
2019-03-14 18:24:02 +05:30
a887cf8b92
slider controller name issue
2019-03-14 17:05:18 +05:30
319e4edeb1
some more logic is required for proper scrolling of menu bar
2019-03-14 15:50:24 +05:30
4ed551c008
removing zoom
2019-03-14 14:41:21 +05:30
4ab95b1464
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-14 14:34:46 +05:30
ebf96ad9d6
installer isuue & product page changes
2019-03-14 14:34:32 +05:30
556dd64327
removed some dead code
2019-03-14 12:06:51 +05:30
c38e107515
Added api for single lavel child categories
2019-03-14 11:32:47 +05:30
5fc85dffe4
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-14 11:01:04 +05:30
31eab00df7
added disbaled state to the new radio button used on checkout pages
2019-03-14 10:59:35 +05:30
d66f9de5dd
admin layout fixes
2019-03-13 19:47:40 +05:30
b6d14808b6
layout fixes in admin panel
2019-03-13 19:12:00 +05:30
92adadb882
Merge pull request #689 from jitendra-webkul/jitendra
...
Added api for get request
2019-03-13 16:48:30 +05:30
f489c42bdd
Added api for get request
2019-03-13 16:47:52 +05:30
99405ebcaf
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-13 12:34:16 +05:30
634dd0e458
translation added for configuration
2019-03-13 12:33:45 +05:30
fcd99188da
Merge pull request #686 from jitendra-webkul/jitendra
...
Updated customer group mapping function name
2019-03-13 12:25:22 +05:30
672f2f8c2b
Updated customer group mapping function name
2019-03-13 12:24:32 +05:30
62d3685c24
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-13 11:05:33 +05:30
281567456b
product linking completed
2019-03-13 10:33:43 +05:30
9f22696491
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-13 10:21:38 +05:30
3bb197c75a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-13 09:38:36 +05:30
ef30e1d0b5
Added pt-br translation for UI package
2019-03-12 15:36:15 -03:00
9b82321d4f
change in related products
2019-03-12 21:05:10 +05:30
cd9504324c
Adding the scroll event script on navbar left in progress
2019-03-12 19:10:26 +05:30
423fb8c446
Merge pull request #683 from jitendra-webkul/jitendra
...
'getAll' function of ProductRepository modified
2019-03-12 18:33:11 +05:30
ff1154c422
'getAll' function of ProductRepository modified
2019-03-12 18:32:23 +05:30
e512bad843
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-12 18:31:46 +05:30
ec19630b22
Fixed some layout issues with admin
2019-03-12 18:31:15 +05:30
7ad71d1d58
Merge pull request #682 from jitendra-webkul/jitendra
...
Update get all product function
2019-03-12 18:24:00 +05:30
961e00227f
Update get all product function
2019-03-12 18:23:11 +05:30
45afd5652e
Merge pull request #681 from cagartner/pt-br-translation
...
Added pt-br translation
2019-03-12 17:57:37 +05:30
2e2d7d7642
Added pt-br translation
2019-03-12 09:19:27 -03:00
a7eec79fbd
Editor added on category description textarea
2019-03-12 16:45:08 +05:30
99e866d055
Fixed slider controller namespace issue
2019-03-12 16:03:57 +05:30
d2836b50ab
One way to hide the side drawer
2019-03-12 13:39:32 +05:30
97ce7dc195
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-12 12:25:50 +05:30
c9c5208693
Updated the list of exportable grids
2019-03-12 12:19:28 +05:30
9578f7609b
export functionality refactored
2019-03-12 12:13:48 +05:30
12a4c6dc09
Fixed conflict and Assets compiled for prodcution
2019-03-12 12:04:55 +05:30
42b5f91764
Feature Request #666 implented
2019-03-12 11:59:00 +05:30
9eb1deb3fa
Datagrid export functionality refactoring
2019-03-12 11:07:12 +05:30
4dc7ef649c
Merge pull request #673 from prashant-webkul/development
...
disabled side menu toggle for admin, created configuration for produc…
2019-03-12 09:57:57 +05:30
9cfbdc6c1b
Filterable checks implemented in datagrid
2019-03-11 19:36:58 +05:30
238c248852
Filterable checks implemented in datagrid
2019-03-11 19:36:15 +05:30
ff45ce45d3
Merge pull request #674 from jitendra-webkul/jitendra
...
Modified Slider Model
2019-03-11 18:44:06 +05:30
91c55a7010
Modified Slider Model
2019-03-11 18:43:06 +05:30
bd525ef606
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-11 18:42:34 +05:30
20247136a0
disabled side menu toggle for admin, created configuration for product types
2019-03-11 18:39:42 +05:30
19f4429de0
issue #670
2019-03-11 17:57:15 +05:30
43f7d7e9c1
Merge pull request #665 from rahulshukla-webkul/development
...
issue #655
2019-03-08 14:32:24 +05:30
3ad2aec865
issue #655
2019-03-08 13:31:16 +05:30
d1489fa498
Merge pull request #663 from jay-thanki/patch-2
...
subscriber_email email changes
2019-03-08 11:54:13 +05:30
727e6a2b89
subscriber_email email changes
...
change email subscriber_email as footer field assign to this field.
2019-03-08 11:31:31 +05:30
23db740306
subscriber_email changes
...
email names are same for signup form and footer email address field. so i changed footer email addess to subscriber_email
2019-03-08 11:31:18 +05:30
4e803a638b
reverting category changes
2019-03-07 18:31:18 +05:30
faf2400a75
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-07 18:22:08 +05:30
b0d0e63d0d
issues #656 , #618 , #384 & linked products changes
2019-03-07 18:21:49 +05:30
1e215e43c0
Some html attributes added on the checkout pages
2019-03-07 10:05:05 +05:30
17755bcc2d
assets for the UI package compiled for production
2019-03-06 11:54:27 +05:30
c2ae22a262
merge with master
2019-03-05 18:35:44 +05:30
76aa1da818
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-05 18:33:58 +05:30
95c898c4a8
up-sell, cross-sell & related-product
2019-03-05 18:32:15 +05:30
aac1c583f5
assets compiled for production
2019-03-05 16:32:12 +05:30
7ae4be56b8
fixed issue #642 , made changes in layout of checkout section, various display bugs had been fixed
2019-03-05 16:28:55 +05:30
eb38784f7f
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-05 15:16:35 +05:30
24faf854c5
up-sellling completed
2019-03-05 15:16:17 +05:30
1079331358
Conflict fixed
2019-03-05 13:17:58 +05:30
4c28aceab5
Product gallery selected thumbnail border color changed to brand color
2019-03-05 13:15:21 +05:30
f7d8f726f7
Merge pull request #644 from prashant-webkul/development
...
changed address card class on onepage checkout
2019-03-05 10:55:11 +05:30
c0dd164345
Merge pull request #648 from jitendra-webkul/jitendra
...
Excluded image swatch attributes from layed navigation
2019-03-05 10:54:38 +05:30
70c4e69aaf
Excluded image swatch attributes from layed navigation
2019-03-05 10:53:50 +05:30
ab9bf8ea97
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-03-04 10:11:39 +05:30
ca39b84d0b
upsell product
2019-03-04 10:11:24 +05:30
54835099ba
made the changes in checkout page by applying id attribute for all sections, so it would be easy for js to identify the section and usage of the script accordingly, the primary need was to add the id attribute on the continue button as it was needed for the section validation
2019-03-02 14:01:34 +05:30
9df1c291a6
Checkout's payment method front end rendering order function changed from unshift to push
2019-03-01 18:17:21 +05:30
bce57ed750
changed address card class on onepage checkout
2019-03-01 11:21:53 +05:30
2c3d1d1096
Merge pull request #641 from prashant-webkul/development
...
Development
2019-03-01 11:08:37 +05:30
62f8cf1bad
Fixed issue #642
2019-03-01 11:05:56 +05:30
da73d59853
Merge pull request #643 from jitendra-webkul/jitendra
...
ACL issue fixed
2019-03-01 11:01:11 +05:30
e099492fd9
ACL issue fixed
2019-03-01 11:00:15 +05:30
543af40328
Issue in shipments grid is fixed
2019-02-28 16:29:46 +05:30
d84cf69661
Fixed the issue #620
2019-02-28 16:24:10 +05:30
ccea6689f1
address card list issue fix
2019-02-28 10:54:10 +05:30
e2facbc329
All the color values have been converted into variables for shop package
2019-02-28 10:37:21 +05:30
674639a008
Merge pull request #640 from jitendra-webkul/jitendra
...
Jitendra
2019-02-27 20:30:44 +05:30
876041aee4
Issue #639 fixed
2019-02-27 20:30:07 +05:30
efa2dd143b
Issue #638 fixed
2019-02-27 20:10:04 +05:30
d05edec01e
Color swatch issue fixed
2019-02-27 20:09:21 +05:30
56a413c37b
Merge pull request #637 from jitendra-webkul/jitendra
...
Shipment grid issue fixed
2019-02-27 19:18:07 +05:30
cceed7d048
Shipment grid issue fixed
2019-02-27 19:17:13 +05:30
73a3654773
Merge pull request #634 from jitendra-webkul/jitendra
...
Front review date format changed
2019-02-27 16:29:48 +05:30
ff37ad3c58
Front review date format changed
2019-02-27 16:29:03 +05:30
268ec5e425
Merge pull request #632 from prashant-webkul/development
...
Development
2019-02-27 14:46:24 +05:30
bd5c88a29e
eventbus events on checkout onepage
2019-02-27 14:28:50 +05:30
570442ad3e
Fixed cart controller issue
2019-02-27 13:07:27 +05:30
d7d8eb31a8
Increased datagrid deafult pages limit to 15
2019-02-27 12:27:07 +05:30
e5f1abe7a9
Product grid item per page increased to 20
2019-02-27 12:02:48 +05:30
01f3cd7324
convertToBasePrice function added to Core class
2019-02-26 19:07:51 +05:30
1ce5a957f9
convert price function issue fixed
2019-02-26 18:45:55 +05:30
c5aceb72d0
event bus events added in onepage checkout for shipping and payments
2019-02-26 18:24:38 +05:30
90540d445e
Fixed swatch issue
2019-02-26 14:32:18 +05:30
c02d75774d
rtl class removal
2019-02-26 14:18:42 +05:30
724c81ffd7
conflict resolve
2019-02-26 14:13:07 +05:30
2775885b61
Merge pull request #625 from jitendra-webkul/jitendra
...
Added margin top on pagination
2019-02-26 13:14:59 +05:30
71ddbacbd8
Added margin top on pagination
2019-02-26 13:14:18 +05:30
7ab9b2d6f7
Merge pull request #624 from jitendra-webkul/jitendra
...
Issue #588 fixed
2019-02-26 13:07:41 +05:30
0f382acbf4
Issue #588 fixed
2019-02-26 13:06:51 +05:30
8394fc19ae
Merge pull request #623 from jitendra-webkul/jitendra
...
Issue #621 fixed
2019-02-26 13:00:35 +05:30
4f420ca483
Issue #621 fixed
2019-02-26 12:59:58 +05:30
242b64afbf
Merge pull request #614 from prashant-webkul/development
...
Development
2019-02-26 11:56:43 +05:30
c1d890ee56
Merge pull request #622 from jitendra-webkul/jitendra
...
Option swatches feature added
2019-02-26 11:55:42 +05:30
0c84a9dcb2
Option swatches feature added
2019-02-26 11:55:00 +05:30
35cdb1fd52
rtl css changes for admin
2019-02-25 19:05:45 +05:30
7cfc0d3710
issue #618 & #619 & rtl css changes
2019-02-25 18:06:18 +05:30
f79473a598
fixed issue #589
2019-02-25 09:45:12 +05:30
5e704a4979
more testcases for customer authentication
2019-02-23 17:23:46 +05:30
53094cadca
Auth tests written
2019-02-23 16:13:24 +05:30
db0cd27c0d
issue #615
2019-02-22 17:05:27 +05:30
3d94bfcd6e
migration name changed according to current conventions
2019-02-22 16:25:49 +05:30
33a58daa35
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-22 16:15:16 +05:30
3aacfc6acf
admin name for attribute
2019-02-22 15:55:29 +05:30
8ebb6868c5
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-22 15:00:45 +05:30
2da9f80bea
issues #586
2019-02-21 18:40:43 +05:30
19101afc18
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-21 16:36:45 +05:30
59ecc0f019
guest review
2019-02-21 16:36:27 +05:30
491504a844
Merge pull request #609 from jitendra-webkul/jitendra
...
Issue #608 fixed
2019-02-21 15:02:49 +05:30
fd07499407
Issue #608 fixed
2019-02-21 15:01:44 +05:30
a7f545fcf4
issue #594
2019-02-20 19:11:46 +05:30
2d62465d60
issues #596 and #597
2019-02-20 17:14:14 +05:30
be1de2d1ab
assests compile
2019-02-20 14:46:44 +05:30
63063e4602
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-20 14:44:45 +05:30
f2af7bc84a
table css change
2019-02-20 14:44:18 +05:30
e2b411547d
Issue #581 fixed
2019-02-20 14:30:54 +05:30
1f13298b65
base sync with master
2019-02-20 13:02:59 +05:30
a172a1c139
Fixed grid filter tags Ui
2019-02-20 12:51:55 +05:30
5e4ab5dd8f
Webpack mix files updated and assets compiled for production
2019-02-20 12:38:09 +05:30
cb4f1ce65a
rtl added to body tag if locale code is ar
2019-02-20 12:17:40 +05:30
37e605e489
Issue #585 fixed
2019-02-20 12:10:02 +05:30
834ed4badc
Issue #592 fixed
2019-02-20 12:06:53 +05:30
3d5e2955a4
Issue #598 fixed
2019-02-20 11:57:06 +05:30
0e9e94683d
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-19 11:23:28 +05:30
994da4a2b3
reverting changes of view
2019-02-19 10:07:13 +05:30
22b19ec277
product image
2019-02-19 09:59:50 +05:30
1f30971c63
Fixed issue #592
2019-02-18 18:39:48 +05:30
4eb752cd10
Fixed issue #304 and some more changes
2019-02-18 17:21:04 +05:30
262bfbbd06
Fixed issue #304
2019-02-18 17:19:54 +05:30
1a9c3d56c2
issue #587 & css changes
2019-02-18 17:01:53 +05:30
b019a248cf
interfaces & proxy class implemented
2019-02-18 13:00:40 +05:30
6172692954
assests compile & merge with master
2019-02-15 20:13:02 +05:30
704f6851a3
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-15 20:10:58 +05:30
36cb09bc58
address while checkout & reduces code
2019-02-15 20:10:47 +05:30
7e20684c0f
Issue Fixed (If product visiblity is set as false than products are showing on new and featured section)
2019-02-15 19:43:03 +05:30
d2f620bb9f
Issue fixed (If configurable product added to cart without options)
2019-02-15 19:38:10 +05:30
d673b2a7b5
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-15 14:58:11 +05:30
0330353e08
removal of default address
2019-02-15 14:58:00 +05:30
f3cd11737c
sync with base master
2019-02-15 13:28:52 +05:30
78cb14d0dd
Merge pull request #579 from jitendra-webkul/jitendra
...
Fixed view event issues
2019-02-15 13:07:59 +05:30
a03e5dc132
Fixed view event issues
2019-02-15 13:07:02 +05:30
62d3f4c9df
Merge pull request #578 from jitendra-webkul/jitendra
...
View event added to catalog pages
2019-02-15 12:54:24 +05:30
dda8b0bc92
View event added to catalog pages
2019-02-15 12:52:26 +05:30
455f9442d4
conflict resolve
2019-02-15 11:35:45 +05:30
05d3318cc8
assests compile
2019-02-15 11:32:00 +05:30
15fe87d72c
Assets compiled for production
2019-02-15 11:31:19 +05:30
0b0f425bf4
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-15 11:29:05 +05:30
d7213db2c9
customer password
2019-02-15 11:28:47 +05:30
3d0da8812d
View event added on checkout payment and shipping section
2019-02-15 11:24:26 +05:30
f68c4e482c
Fixed bug #575
2019-02-15 09:51:38 +05:30
7c72d6e3b1
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-14 21:20:33 +05:30
4a648f549a
checkout with multiple address #210
2019-02-14 21:20:10 +05:30
550cabcbcb
Translation strings for datagrid and removal of dead code and pretty syntax
2019-02-14 19:24:44 +05:30
42b929bb22
admin user intended url functionality reverted
2019-02-14 18:20:04 +05:30
621455ed48
minor fixes
2019-02-14 17:57:07 +05:30
718a5eaa20
Resolved the issue #517 and removed the intented url from admin as admin don't require
2019-02-14 17:54:46 +05:30
63bac873c3
adding all get all channel functions in channel repo
2019-02-14 12:07:08 +05:30
b28f48cf95
Confirm box implemented for datagrid actions
2019-02-13 19:10:23 +05:30
77b9083d47
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-13 17:42:18 +05:30
e4bdf11a7d
lang added
2019-02-13 17:42:07 +05:30
77618d23f8
Assets compiled for production
2019-02-13 15:29:55 +05:30
3d9d61fafe
UI fix in accordian
2019-02-13 15:18:21 +05:30
510ee89aad
language meta tag added for storefront
2019-02-13 15:05:56 +05:30
a745596ac8
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-13 14:53:44 +05:30
35d0030633
Added config field infomation option
2019-02-13 14:51:51 +05:30
5c4ab00f83
Fixed configuration repository select field issue
2019-02-13 13:11:31 +05:30
616d1bf160
merged with master
2019-02-13 11:40:56 +05:30
98f3edc199
Assets compiled for production
2019-02-12 20:11:44 +05:30
8b9edf9e7d
marketplace responsive & installer
2019-02-12 16:46:55 +05:30
5ea84dff76
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-12 14:57:12 +05:30
f38472d26b
Accordian component's UX changed slightly according to new design guidelines
2019-02-12 14:56:56 +05:30
b979fc19e0
Assets compiled for production
2019-02-12 13:19:29 +05:30
e824f4741b
assests compile
2019-02-11 18:12:06 +05:30
15ae803407
merge with master
2019-02-11 17:18:06 +05:30
1c16e2f2a9
validation for upload
2019-02-11 17:15:22 +05:30
8c201f1bbb
Issue #545 fixed
2019-02-11 15:35:02 +05:30
69ca02540b
Merge pull request #561 from jitendra-webkul/jitendra
...
Jitendra
2019-02-11 15:20:54 +05:30
7bfb216bb0
Dashboard sql issue fixed
2019-02-11 15:13:38 +05:30
2b382df075
Issue #532 fixed
2019-02-11 15:02:34 +05:30
7ba43a8fea
Dead code removed from currency seeder and model
2019-02-11 13:31:05 +05:30
e4dc9da03f
Removed the currency symbol table migration and seeder
2019-02-11 13:19:49 +05:30
fa8aa2f66e
Issue #556 fixed'
2019-02-11 13:03:17 +05:30
d1b14fa38e
remove extra rendering & change in script
2019-02-08 19:39:05 +05:30
446adfba0c
backend validation for import
2019-02-08 17:24:48 +05:30
fdcf420af9
import for tax rate
2019-02-08 16:53:48 +05:30
b72123db51
Currency symbol table implemented with relationship with currency as a fallback if the symbol for the currency is not found
2019-02-08 16:05:50 +05:30
4661e5b738
mass updated for product review updated for customer review datagrid
2019-02-08 15:46:43 +05:30
5584aa27a8
Disapproved functionality for customer review implemented
2019-02-08 15:44:00 +05:30
af5f039cb9
category creation fix
2019-02-08 15:32:33 +05:30
cd6d6c89a8
Fixed the issue #555
2019-02-08 13:02:25 +05:30
69aeb2a254
added a function to find the state by code and country code
2019-02-07 13:58:14 +05:30
b1b39d2c74
Fixed issue #545 as Admins don't require intended url functionality only customers do
2019-02-06 18:49:59 +05:30
de6507ff08
Fixed Issue #551 - Root Category Getting Deleted
2019-02-06 16:28:00 +05:30
2fec94082c
Fixed account menu issue
2019-02-04 20:32:06 +05:30
b0c96a0b02
Updated channel homepage content
2019-02-04 17:08:00 +05:30
0c7e4922ea
Merge pull request #542 from jitendra-webkul/jitendra
...
Assets compiled for production
2019-02-04 15:42:28 +05:30
f2f3592376
Assets compiled for production
2019-02-04 15:41:43 +05:30
e02ae145df
Merge pull request #541 from rahulshukla-webkul/development
...
Development
2019-02-04 15:34:09 +05:30
6fe7167ecd
assets compiled for production
2019-02-04 15:30:10 +05:30
ad1b2c5f7c
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-04 15:29:33 +05:30
1a4a3c22e6
Merge pull request #539 from jitendra-webkul/jitendra
...
After login customer will redirect ti previous page
2019-02-04 15:28:38 +05:30
8d3146e2d6
After login customer will redirect ti previous page
2019-02-04 15:27:49 +05:30
b359957bc2
Merge pull request #538 from jitendra-webkul/jitendra
...
Jitendra
2019-02-04 15:24:03 +05:30
35ccc65342
Fixed shipment grid shipped to column
2019-02-04 15:23:06 +05:30
01d2d7cfcb
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-04 15:20:28 +05:30
a741e0e570
config changes
2019-02-04 15:20:15 +05:30
49ddcd0256
Issue #191 fixed
2019-02-04 15:18:24 +05:30
8b3bf5a6ab
assets compiled for product
2019-02-04 15:18:20 +05:30
8f78d8f2be
issue #368 readdressed and same fix applied again after reviewal
2019-02-04 15:14:02 +05:30
c304bb0781
Merge pull request #537 from jitendra-webkul/jitendra
...
Issues #353 , #447 , #530 , #522 fixed
2019-02-04 14:57:10 +05:30
639d4b1581
Issues #353 , #447 , #530 , #522 fixed
2019-02-04 14:56:13 +05:30
072d61f20e
Wishlist move to cart when product quantity is exhausted, showing improper validation message. Issue #402 fixed.
2019-02-04 13:51:26 +05:30
1d83049a12
#531
2019-02-04 13:13:10 +05:30
08fe30ac61
#523 and #519
2019-02-04 12:02:59 +05:30
4c7f516313
responsive css
2019-02-02 20:45:25 +05:30
7985c4c225
header resposive issue
2019-02-01 19:12:51 +05:30
2438630be4
Assets compiled for production
2019-02-01 18:03:17 +05:30
461d594c6a
Merge pull request #527 from rahulshukla-webkul/development
...
Development
2019-02-01 17:23:46 +05:30
c1e08f61e2
Merge pull request #526 from jitendra-webkul/jitendra
...
Flash css issue fixed
2019-02-01 17:13:32 +05:30
ffa97f2c55
Flash css issue fixed
2019-02-01 17:12:38 +05:30
32777f3965
revert change
2019-02-01 17:12:19 +05:30
317688ce38
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-01 17:06:45 +05:30
745d6c1b48
responsive header menu
2019-02-01 17:06:32 +05:30
50df14c2de
Merge pull request #525 from jitendra-webkul/jitendra
...
Acl issue fixed for Configuration pages
2019-02-01 17:06:05 +05:30
822d1b667c
Acl issue fixed for Configuration pages
2019-02-01 17:05:19 +05:30
2d99b565b1
Merge pull request #509 from rahulshukla-webkul/development
...
configuration changes
2019-02-01 16:48:25 +05:30
cc4a88f271
Fixed issue #143
2019-02-01 16:24:39 +05:30
c3e0f7acad
Merge pull request #518 from jitendra-webkul/jitendra
...
Fixed grid issues
2019-02-01 15:08:00 +05:30
cc6ca21447
Fixed grid issues
2019-02-01 15:07:11 +05:30
557a7c0b01
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-01 12:31:45 +05:30
263f7ad92e
Merge pull request #516 from jitendra-webkul/jitendra
...
Jitendra
2019-02-01 12:20:19 +05:30
2d1a816349
Issue #514 fixed
2019-02-01 12:19:30 +05:30
a881219f02
Fixed issue 513
2019-02-01 09:20:07 +05:30
91b8bfeba2
Rating label fixed on product view page
2019-01-31 18:38:45 +05:30
649f72087d
Updated datagrid's item count
2019-01-31 17:36:43 +05:30
41d3f74fc1
configuration changes
2019-01-31 17:04:32 +05:30
fcdf86eb73
Assets compiled for production
2019-01-31 15:23:53 +05:30
e00ca5808f
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-31 15:18:48 +05:30
ee91d69361
configuration changes
2019-01-31 15:18:36 +05:30
29065eeba7
Currency switcher dropdown issue fixed
2019-01-31 12:29:35 +05:30
7dae5da461
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-30 21:26:07 +05:30
2f8178afc0
file & image field for configuration
2019-01-30 21:25:38 +05:30
bb635f1673
Fixed front header layout
2019-01-30 20:11:07 +05:30
1241eff9a7
View event added in front header
2019-01-30 19:10:59 +05:30
54f3f2f5b6
Items label added in order item table
2019-01-29 19:02:41 +05:30
e178217fce
Assets compiled for production
2019-01-29 18:43:52 +05:30
118e9e89c5
Merge pull request #497 from prashant-webkul/development
...
Fixed issues, bugs and general enhancements.
2019-01-29 18:41:34 +05:30
b315babc8c
Refactor product repository
2019-01-29 18:40:14 +05:30
70c114d3a6
Channel homepage content updated in seeder
2019-01-29 18:32:10 +05:30
af6e9351af
Fixed issue #426 for the maintenance page was not working due to our own custom handler was not handling the HTTP exception 503 on an independent file
2019-01-29 18:25:42 +05:30
be941760f8
fixed issue 398 for wrong flash notifications due to improper validations and removed the phone field from the customer as it was no longer available in the customers table
2019-01-29 17:08:02 +05:30
ae4b1cebe2
Merge pull request #495 from rahulshukla-webkul/development
...
Development
2019-01-29 16:21:28 +05:30
592f38b4ea
Issue #396 fixed
2019-01-29 16:09:28 +05:30
209f73d46b
Issues #217 , #396 , #227 , #321
2019-01-29 16:05:43 +05:30
3a69f76b96
Fixed issue #368
2019-01-29 16:05:30 +05:30
ef1687b88c
default sort order on the default index of the datagrids had beenh set to descending order
2019-01-29 13:44:27 +05:30
36f98a8a4e
issue #234
2019-01-28 17:05:06 +05:30
9c934d8e8d
issues #401
2019-01-28 15:04:45 +05:30
e89a9ac930
Migration Fix
2019-01-28 14:01:49 +05:30
f624f910d7
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-25 21:28:35 +05:30
70fed940a4
issue #438
2019-01-25 21:28:18 +05:30
f92594176a
Paypal ipn issue fixed
2019-01-25 21:15:49 +05:30
230f9ff988
Channel inventories seeder added
2019-01-25 20:51:24 +05:30
e1bd021e19
Assets compliled for prodcution
2019-01-25 20:19:13 +05:30
96a10338dd
merge with master
2019-01-25 20:13:08 +05:30
6b762686a3
changes for installer
2019-01-25 20:11:35 +05:30
7cf585c8da
Fixed issue #390
2019-01-25 19:44:07 +05:30
45c8bba4f5
Complied assets for production
2019-01-25 17:30:46 +05:30
6fff4701a6
Flat rate implemented
2019-01-25 17:24:48 +05:30
54377fd966
installer command differentilate according OS
2019-01-25 17:22:59 +05:30
363efffaaa
merge with master
2019-01-25 10:58:47 +05:30
e4592f85e8
header menu
2019-01-25 10:56:59 +05:30
06108b4698
issue #395 & #261
2019-01-24 19:21:13 +05:30
712c5bd5a7
installer
2019-01-24 11:03:11 +05:30
550f26f865
product flat implemented but needs some label attributes modifications and rigorous testing
2019-01-24 10:51:36 +05:30
604f9d7da5
Product flat create and update now both implemented
2019-01-23 17:08:17 +05:30
67dbce6fa8
Product flat implementation working, now binding it with the product update evento to write the
2019-01-23 16:35:34 +05:30
07daf7d310
product flat now showing up with relevant attributes data
2019-01-22 18:53:17 +05:30
810d5928c3
product flat all set with data structure with all the permutations of channels and locales now being recorded from the product attribute values
2019-01-22 18:25:47 +05:30
a269dc614f
composer for installer
2019-01-22 16:13:56 +05:30
f156511e97
merged with master
2019-01-22 10:35:05 +05:30
5381f8ea8e
Fixed
2019-01-21 17:18:39 +05:30
2172ac60dd
fixed the issues with routes of actions in admin datagrids
2019-01-21 16:29:20 +05:30
14730fe432
Category add link fixed
2019-01-21 16:19:38 +05:30
8f4093d49a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-21 15:53:28 +05:30
f553dcdc71
assets compiled for production
2019-01-21 15:52:56 +05:30
dd36c2adf1
Seeder issue fixed
2019-01-21 15:51:28 +05:30
42eb46e78c
Asset compiled for production
2019-01-21 15:26:00 +05:30
6e2dad64de
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-21 15:20:52 +05:30
ffe0f246b4
for alpha today
2019-01-21 15:20:01 +05:30
61c10dd48d
Category seeder added
2019-01-21 14:36:38 +05:30
3289ab8a4a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-21 12:39:36 +05:30
b19f02f5c0
UI issue fix in datagrid mass action master checkbox check and uncheck
2019-01-21 10:56:50 +05:30
9eeaee1c66
migration changes in the product flat table
2019-01-19 15:35:12 +05:30
66c74af6ca
attribute update event for product flat is suppressed for now as code and type never gets changed when updating the attribute
2019-01-18 18:56:46 +05:30
14dfec8365
attribute creation and deletion now syncing with columns of product_flat, label is now also creating when attribute type is select or multiselect
2019-01-18 18:49:51 +05:30
33a75c306d
Added view event manager to checkout and cart page
2019-01-18 18:16:05 +05:30
50a0a71196
product flat column creation and deletion on the basis of attributes
2019-01-18 17:36:58 +05:30
e7c5c373e2
Merge pull request #474 from jitendra-webkul/jitendra
...
Inventory issue fix
2019-01-18 17:24:25 +05:30
70a24a64b9
Inventory issue fix
2019-01-18 17:23:36 +05:30
71df0dea94
Merge pull request #473 from jitendra-webkul/jitendra
...
Issue #389 fixed
2019-01-18 16:49:58 +05:30
b418b27de3
Issue #389 fixed
2019-01-18 16:49:03 +05:30
63f141e3bd
Merge pull request #472 from jitendra-webkul/jitendra
...
Issues fixed
2019-01-18 16:41:22 +05:30
fbbf1fe99f
Issues fixed
2019-01-18 16:40:40 +05:30
bcb2661722
Datagrids display issue fixed when toggling massactions
2019-01-18 14:59:19 +05:30
0edebcf5c7
Table display issues when use mass actions filters and products flat events
2019-01-18 13:08:42 +05:30
871bf40d3a
Merge pull request #470 from jitendra-webkul/jitendra
...
Global Event bus added for vue
2019-01-18 13:05:32 +05:30
00b9007d99
Global Event bus added for vue
2019-01-18 13:04:49 +05:30
00ac9bbc01
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-18 12:06:34 +05:30
e2cfd0683c
installer changes for windows
2019-01-18 12:05:53 +05:30
4363dc17b2
Issue #457 fixed
2019-01-18 11:00:55 +05:30
c596ee8abe
Extra new line removed from order repository
2019-01-18 10:48:25 +05:30
e2037c4892
datagrid's configuration dependency is removed and dynamic row format is back
2019-01-18 10:33:42 +05:30
bd9ddfb0d7
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-17 20:22:20 +05:30
d50bb3e962
configuration message
2019-01-17 20:22:01 +05:30
4488002522
Updated event code for order action
2019-01-17 17:29:07 +05:30
d19d57997e
Added Order Cancel Event
2019-01-17 17:17:53 +05:30
e7b2bdb72c
sort issue fixed, will not work when false is passed
2019-01-17 16:51:59 +05:30
0e94d67a79
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-17 16:42:26 +05:30
5130a640c1
Sub Total Column added to the order grid
2019-01-17 16:24:57 +05:30
83e44c75f5
mass action validation
2019-01-17 16:17:30 +05:30
eb373d7ecb
More changes in datagrid, regarding implementation of wrapper columns
2019-01-17 15:24:58 +05:30
bac0d48ab3
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-17 15:18:11 +05:30
e018d6555f
export issue
2019-01-17 15:17:44 +05:30
25e485274e
read me changes
2019-01-17 11:59:51 +05:30
1f3d84ed7e
default index parameter corrected for some datagrids
2019-01-17 11:27:22 +05:30
4c3f70f60c
datagrid mass selection issue is fixed when no checkboxes for record is checked then master checkbox is also automatically unchecked
2019-01-17 11:23:04 +05:30
30a2031867
Datagrid filters bug fix due to return statement used it was working on only first filter only
2019-01-17 11:14:28 +05:30
89ec9b5a9e
bug fix for action and massaction in datagrid
2019-01-17 10:23:03 +05:30
9e3019f882
Merge pull request #460 from jitendra-webkul/jitendra
...
Now config field label will be tranlate
2019-01-16 20:08:43 +05:30
fb6a16596a
Now config field label will be tranlate
2019-01-16 20:07:48 +05:30
342cbd5459
New filters type for price column added as numeric type
2019-01-16 20:02:00 +05:30
31f6e62bd0
a new type of column for price added
2019-01-16 19:57:45 +05:30
0776c8f331
width parameter in datagrid will now run as optional
2019-01-16 19:47:39 +05:30
6c9b381d4c
Changes in datagrids
2019-01-16 19:19:37 +05:30
e38763c126
Enable action and mass action will not bother whether implemented or not on the datagrid files
2019-01-16 16:53:19 +05:30
8c32a21521
export changes
2019-01-16 16:43:36 +05:30
4747f8fb59
customer design fixex
2019-01-16 14:08:39 +05:30
e48ac7e295
datagrid sort and filter fixes
2019-01-15 18:55:50 +05:30
fc130dbcaa
tinymce issue fixed
2019-01-15 18:16:16 +05:30
575373cd75
Coding standard updated
2019-01-15 17:32:43 +05:30
aae6593469
Coding standard updated
2019-01-15 17:24:41 +05:30
cedfeb034a
Merge pull request #452 from prashant-webkul/development
...
Development
2019-01-15 16:08:58 +05:30
976b29fe59
datagrid fixes
2019-01-15 16:07:06 +05:30
a781594b10
Translations added for menu and acl lables
2019-01-15 16:03:55 +05:30
0607a9e818
set index as abstract method changed to protected property
2019-01-15 16:00:26 +05:30
9aa55472ab
Datagrid issue fixes
2019-01-15 15:47:13 +05:30
6e966384e5
Disabled customer email verfication and removed the phone field from the customer model
2019-01-15 13:03:41 +05:30
c0da6fbd73
Attribute family creation issue fixed
2019-01-14 19:41:34 +05:30
6040e464fd
Pagination count changed in all grids
2019-01-11 20:07:53 +05:30
ce2094d34c
Asset compiled for production
2019-01-11 20:03:40 +05:30
a2c02817f8
added labels to the filter tags
2019-01-11 19:55:44 +05:30
11fd8adfff
pagination fixes in newly refactored datagrid
2019-01-11 18:35:25 +05:30
7785475eb9
mass actions enhanced and one bug remvoed causing value havoc
2019-01-11 17:23:36 +05:30
6d203fd8f6
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-11 16:56:10 +05:30
128e316265
pagination fixes
2019-01-11 16:55:10 +05:30
9b85622533
unnecessary code is removed
2019-01-11 15:42:34 +05:30
34efd4d2c6
Assets compiled for production
2019-01-11 15:32:15 +05:30
9c1612d0ab
Assets compiled for production
2019-01-11 15:31:10 +05:30
ca95d1d595
Variable names conflicts in body of datagrid causing view action to producce exception is fixed
2019-01-11 15:27:11 +05:30
f935937cbe
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-11 15:01:04 +05:30
dcb7029df2
validation changes
2019-01-11 15:00:44 +05:30
64e52e5371
country & state issue
2019-01-11 14:54:03 +05:30
f1371fd6a0
Product inventory management updated
2019-01-11 14:51:20 +05:30
6f4aebe423
Datagrid enhancements and fault tolerant to column orders display and safe implementation of wrappers
2019-01-11 13:58:44 +05:30
91c4a4205b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-11 10:40:06 +05:30
b7d15d4d0e
validatio issue
2019-01-11 10:39:41 +05:30
436557fe81
minor changes in datagrid frontend templates
2019-01-10 18:54:35 +05:30
6c8bdf20c0
subtle changes in datagrid done and all datagrids have been refactored
2019-01-10 18:09:46 +05:30
a4485e2191
merged with master
2019-01-10 11:54:17 +05:30
479341eaef
all datagrids converted according to newly refactored pattern
2019-01-10 11:51:45 +05:30
f5450cc516
Some fault tolerancy needs to be addressed before completing the refactoring
2019-01-09 17:11:00 +05:30
ab07518779
Order collect total function issue fixed
2019-01-09 13:27:43 +05:30
25e5191581
Order collect total function issue fixed
2019-01-09 13:24:59 +05:30
d55bd0e115
Datagrid refactoring styling is complete, only mass actions are needed to be implemnented along with wrappers and callbacks
2019-01-08 17:22:23 +05:30
f7f4395c20
refactoring complete, now moving on to the mass actions refactoring in the datagrids and refactoring the existing grids
2019-01-08 16:32:39 +05:30
dbc218243f
Datagrid refactoring complete 95%, remaining with distincts and refactoring all grids according to the newly refactored method
2019-01-08 13:59:13 +05:30
d68e14f12e
datagrid refactoring completed to 80%
2019-01-08 13:00:20 +05:30
6d3bcca6f8
filters and sorts done, yet facing an issue url writing and decoding
2019-01-07 18:14:43 +05:30
ce06916b3a
Cart issue fixed
2019-01-07 17:27:07 +05:30
264e2b2a16
Cart item custom price implemented
2019-01-07 16:40:26 +05:30
239d151887
Cart add event code updated
2019-01-07 16:11:11 +05:30
16cb592130
Event added to cart
2019-01-07 16:00:28 +05:30
926158cc0d
datagrid refactored from backend to frontend, remaining is filters, sorts and searches to be refactored into vue components
2019-01-07 13:37:35 +05:30
b388dc9aa6
Assets compiled for production
2019-01-04 19:24:03 +05:30
1e2d7418ca
merge with master
2019-01-04 19:13:53 +05:30
90262c14c0
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-04 19:13:33 +05:30
e2765b2e1c
Review view updated
2019-01-04 19:09:27 +05:30
33ac4c1319
multiselect for configuration
2019-01-04 11:13:24 +05:30
cb0a50233c
Datagrid now fault tolerant on not passing select key in its configuration
2019-01-03 16:54:13 +05:30
7117038287
datagrid operator bag dependency removed , now operators are already there in Datagrid classes
2019-01-03 15:43:47 +05:30
2b32a6252e
black listing some key parameters from the request bag and server bag and post bag
2019-01-03 14:53:01 +05:30
b430d4d4b5
merge with master
2019-01-02 20:15:05 +05:30
0bf6699746
issues fixes #320 #288 #309
2019-01-02 20:12:49 +05:30
98e2d0e52c
Merged with master
2019-01-02 20:07:00 +05:30
6ae9dbaef4
Issue fixed
2019-01-02 20:05:11 +05:30
29ab4f1da9
merge with master
2018-12-31 18:51:42 +05:30
9eabca881f
Merge pull request #423 from jitendra-webkul/jitendra
...
Channel alter migration issue fixed
2018-12-31 18:49:50 +05:30
c49e7b6e5f
Channel alter migration issue fixed
2018-12-31 18:49:06 +05:30
96b7f05c23
bagisto installer , #399 #400 #382 #301 #344 #214 #359 #223 #138 issue fixed
2018-12-31 17:27:32 +05:30
4e89ce082e
Merge pull request #422 from jitendra-webkul/jitendra
...
Channel root category feature added
2018-12-31 16:35:50 +05:30
cb3da5fc08
Channel root category feature added
2018-12-31 16:34:26 +05:30
Prashant Singh
jitendra
Jitendra Singh
rahul shukla
Prashant Singh
imanghafoori
shaiv-webkul
prateek srivastava
Jiayu Shen
shenjiayu
naresh verma
rahulshukla-webkul
Prateek Srivastava
Carlos Augusto Gartner
Jay Thanki
mohdfaiz.dev