rahul shukla
1b95d3d877
product creation on channel based and admin logo
2019-07-30 10:36:26 +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
moe2566
09cfa77378
Update anonymous-master.blade.php
2019-07-24 10:19:50 -04:00
rahul shukla
1dd5faa21d
change Datatype for code
2019-07-24 17:55:32 +05:30
Moshe Lustigman
a0ba845e37
Add text direction configuration for locales
2019-07-23 18:05:57 -04:00
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
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
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
rahul shukla
3200cbafc6
Issue #1190 .
2019-07-19 16:30: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
48d068d760
ConvertXToProductID bug fix when left null
2019-07-18 18:20:21 +05:30
Prashant Singh
b512666ef1
ConvertXToProductId from attributes implemented
2019-07-18 14:08:36 +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
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
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
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
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
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
Prashant Singh
88611c9d84
Fixed issue #1172
2019-07-11 09:49:32 +05:30
Prashant Singh
abd3913d45
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-10 10:37:29 +05:30
rahul shukla
cc4dfcad76
issue #1160 , filterable attribute & configuration updated for validation
2019-07-09 14:47:40 +05:30
Prashant Singh
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
rahul shukla
746a17dcf6
conflict resolve
2019-07-08 13:13:34 +05:30
rahul shukla
c7add7e2fe
removal of excess code in search, locale & currency
2019-07-08 13:10:41 +05:30
Jitendra Singh
2c45ddee13
Merge pull request #1157 from danielpinon/patch-1
...
Updating translations of languages in pt_BR
2019-07-08 12:13:54 +05:30
Daniel Pinon
723f6ad639
Clearing duplicity
2019-07-06 23:59:59 -03:00
Daniel Pinon
c5fe78014c
Updating translations of languages in pt_BR
2019-07-06 23:58:01 -03:00
Prashant Singh
c8e8df1699
Added configuration for cart rules
2019-07-06 17:41:58 +05:30
rahul shukla
54481ebbfe
slider edit issue
2019-07-05 18:15:22 +05:30
Prashant Singh
3fe220428c
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-05 13:23:56 +05:30
jitendra
1fd25cfc92
Added currency symbol in currencies table
2019-07-05 11:46:45 +05:30
rahul shukla
60435b724f
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-04 12:38:36 +05:30
rahul shukla
c56d94f7a4
issue #968 and dependent field
2019-07-04 12:38:20 +05:30
Prashant Singh
f8d38e9bbd
Enabled usage parameters of cart rule in create and edit form
2019-07-03 11:37:09 +05:30
jitendra
31b6e779d6
Fixed image wrapper css issue
2019-07-02 17:55:56 +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
366a5fdd20
Refactor code standard
2019-07-01 17:03:36 +05:30
Prashant Singh
3d352b690a
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-29 18:49:08 +05:30
Prashant Singh
1057cd654e
Updated preorder in SAAS
2019-06-29 18:19:39 +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
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
jitendra
55b71e1e66
updated
2019-06-28 19:48:52 +05:30
rahul shukla
34fd4e3840
assets compile for production
2019-06-28 17:11:26 +05:30
rahul shukla
beabada35e
acl added for cart rule & dashboard css changes
2019-06-28 16:30:36 +05:30
Prashant Singh
8a5d57bcc6
new compiled assets for production
2019-06-28 16:30:36 +05:30
Prashant Singh
fce7ec8586
Assets compiled for production and updated the changelog for new release v0.1.6
2019-06-28 16:29:41 +05:30
Prashant Singh
25007824eb
Shipping now getting applied according to selected shipping method
2019-06-27 19:51:17 +05:30
Jitendra Singh
4feeffaf51
Merge pull request #1124 from prashant-webkul/development
...
Fixed issue #1080
2019-06-27 16:18:13 +05:30
Prashant Singh
9b83fb8025
Fixed issue #1080
2019-06-27 16:14:24 +05:30
Jitendra Singh
9eaf46a4d1
Merge pull request #1123 from prashant-webkul/development
...
Product export now added
2019-06-27 14:59:42 +05:30
Prashant Singh
487484f86d
Product export now added
2019-06-27 14:55:32 +05:30
Jitendra Singh
4627c6a519
Merge pull request #1122 from prashant-webkul/development
...
Development
2019-06-27 14:43:51 +05:30
Prashant Singh
c245eab856
Fixed issue #1086 for customer edit
2019-06-27 14:41:01 +05:30
rahul shukla
79b5e1c4cd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-27 14:38:48 +05:30
rahul shukla
a9090e991c
download for image & file type
2019-06-27 14:38:24 +05:30
Prashant Singh
d1395ba145
Fixed issue #1086
2019-06-27 14:24:26 +05:30
Prashant Singh
3f79f2b89a
Fixed issue #1114 , #1112
2019-06-27 13:30:45 +05:30
jitendra
2a5e8b1ddd
Removed propaganistas/laravel-intl dependency
2019-06-27 13:01:47 +05:30
rahul shukla
62cb90e014
status for customer
2019-06-26 18:02:14 +05:30
Jitendra Singh
a60e339218
Merge pull request #1105 from prashant-webkul/development
...
Development
2019-06-25 15:02:46 +05:30
Prashant Singh
68c22f38f6
improvements in cart rules
2019-06-25 14:44:14 +05:30
Prashant Singh
1a262e0f27
Fixed some bugs in cart rules
2019-06-25 12:27:13 +05:30
Prashant Singh
eedc0c6153
eliminated the column is_guest column from cart rules in favor of guest as a customer group
2019-06-25 11:10:21 +05:30
Jitendra Singh
d547ab5058
Merge pull request #1090 from prashant-webkul/development
...
Development
2019-06-21 16:28:59 +05:30
rahul shukla
9080f1e278
removed inline css
2019-06-21 11:37:31 +05:30
rahul shukla
b0c35ead9f
icon issue in admin dashboard
2019-06-21 11:23:27 +05:30
Prashant Singh
8c9fb32ab1
Removed some deadcode of productgrid repository which is no longer needed and had been obselete from many days
2019-06-21 04:15:45 +05:30
Prashant Singh
937d91ea5b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-20 18:10:07 +05:30
rahul shukla
048585853d
repository insted of model in attribute create & edit for locale
2019-06-20 15:12:28 +05:30
Jitendra Singh
bfac46ffdf
Merge pull request #1079 from rahulshukla-webkul/development
...
issue of discount amount in order #1053
2019-06-20 14:34:11 +05:30
Prashant Singh
264d2e3c9e
Added cart rule validation function which validates the cart rule and added unique coupon check while creating or updating couponable cart rule
2019-06-20 13:03:01 +05:30
rahul shukla
f72529f0fb
issue of discount amount in order #1053
2019-06-20 12:17:11 +05:30
Prashant Singh
acad17af67
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-19 18:21:26 +05:30
Prashant Singh
052afb4faf
Fixed issues with apply to shipping and free shipping in create and edit of cart rules
2019-06-19 18:18:21 +05:30
Prashant Singh
423824b531
Fixed issue #1075 and #1074
2019-06-19 18:13:41 +05:30
rahul shukla
5b98b9a86d
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-19 16:32:48 +05:30
rahul shukla
be8c11aa98
issue #1069
2019-06-19 16:32:38 +05:30
Prashant Singh
de445279d2
Fixed bug in product creation changed the name of product type configuration file and implemented new design for condition fields in create and edit pages of cart rules
2019-06-19 16:27:32 +05:30
Prashant Singh
68e0ba1ac1
Fixed issue #1054
2019-06-19 10:58:02 +05:30
rahul shukla
d25cc60351
issues #1056 & 1058
2019-06-18 18:05:52 +05:30
rahul shukla
9166daa31b
issues #1056 & 1058
2019-06-18 17:58:34 +05:30
rahul shukla
1144ce7e10
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-17 18:32:12 +05:30
rahul shukla
94b67d00c1
admin css changes
2019-06-17 18:31:52 +05:30
rahul shukla
0b5f50f1b0
depandent field added in configuaration
2019-06-17 18:22:23 +05:30
Prashant Singh
d18667351c
Base sync
2019-06-17 12:38:29 +05:30
Prashant Singh
ea185aad7b
Discount package bug fixes and complete refactor with overriding features for actions
2019-06-17 08:56:30 +05:30
Prashant Singh
ba31ecd527
Cart rule create and edit forms bug fixes
2019-06-16 22:18:19 +05:30
Prashant Singh
15abe379e0
Changed frontend attributes and syntax fixes in checkout
2019-06-16 17:26:06 +05:30
jitendra
a2d1e1aa85
Column 'code' added in customer_groups table
2019-06-15 18:50:38 +05:30
Prashant Singh
9ae4f8a801
Fixed issues with cart rule customer groups
2019-06-15 18:47:53 +05:30
Jitendra Singh
545cd7386e
Revert "Revert "Fixed issue with order summary rendering on cart page""
2019-06-15 16:49:02 +05:30
Jitendra Singh
65f899dcfe
Merge pull request #1038 from jitendra-webkul/jitendra
...
Guest removed from customer pages
2019-06-15 16:35:42 +05:30
jitendra
ff64d23319
Guest removed from customer pages
2019-06-15 16:34:56 +05:30
Jitendra Singh
7ac715e93d
Revert "Fixed issue with order summary rendering on cart page"
2019-06-15 15:09:59 +05:30
Prashant Singh
0927786cee
Fixed issue with order summary rendering on cart page
2019-06-15 14:56:24 +05:30
Prashant Singh
1e865986c4
improved conditions check in applying cart rules
2019-06-14 19:24:15 +05:30
rahul shukla
c8fb37698c
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-14 14:22:50 +05:30
rahul shukla
0bdd03b331
ticket 201 error & admin css for back icon
2019-06-14 14:22:22 +05:30
Prashant Singh
4bfefd3a07
base sync
2019-06-14 13:22:37 +05:30
Prashant Singh
c52238e45e
Cart rule frontend normalization
2019-06-14 13:21:17 +05:30
Prashant Singh
7f9409bd8e
Checkout and cart page now coupled with cart rules
2019-06-14 12:10:03 +05:30
rahul shukla
5afef79ac2
merge with master
2019-06-13 20:24:52 +05:30
jitendra
6e8c0da054
Fixed conflicts
2019-06-13 19:48:30 +05:30
jitendra
806f8f71f6
Added discount amount to cart item
2019-06-13 19:34:13 +05:30
Prashant Singh
a27bae1c2d
All assets compiled for production
2019-06-13 19:08:42 +05:30
Prashant Singh
769f17a196
Fixed some syntax issue in cart rule controller
2019-06-13 19:00:33 +05:30
Prashant Singh
0aaf3d68e1
Ui package assets compiled for production
2019-06-13 18:20:09 +05:30
rahul shukla
0fc78c5d83
Merge branch 'development' of https://github.com/rahulshukla-webkul/bagisto into development
2019-06-13 14:51:24 +05:30
Prashant Singh
d2e8e822d7
Fixed issue #1007
2019-06-13 12:51:18 +05:30
Prashant Singh
6c0ee913ed
added mass actions in admin customers grid
2019-06-13 12:47:58 +05:30
Prashant Singh
ec27ed4c8d
added credit max in configuration
2019-06-13 01:05:29 +05:30
Prashant Singh
76e43dcd58
added isset checks on admin dashboard causing some rendering issue while there was nothing to be evaluated
2019-06-12 01:05:24 +05:30
rahul shukla
6a8c7a8784
assests compile for production
2019-06-11 16:40:13 +05:30
rahul shukla
5b1f300abf
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-11 16:22:15 +05:30
Prashant Singh
22a81efdb3
fixed issue #1011
2019-06-11 14:51:28 +05:30
Prashant Singh
6b9be23cb0
fixed issue in cart rule for add condition button and exception while updating cart rule
2019-06-11 14:38:57 +05:30
Prashant Singh
de126e38ed
fixed issue with cart rule disc_quantity as validation was allowing zero at the time of creation
2019-06-11 12:32:34 +05:30
rahul shukla
8e37ebe7d5
conflict resolve
2019-06-10 17:13:30 +05:30
rahul shukla
80ac7bba72
customer document
2019-06-10 17:11:56 +05:30
Prashant Singh
0d3539f3c9
fixed validation issues in cart rule #993 & #997
2019-06-10 15:29:19 +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 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
rahul shukla
b7b42ffc15
translation updated
2019-06-04 18:25:54 +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
imanghafoori
e0dd74c06c
clean up
2019-06-04 00:52:37 +04: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
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
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
fb394d974c
Discount calculation added to the cart and discount added to the sales views
2019-05-23 18:44:16 +05:30
rahul shukla
de5952bc36
issue #939
2019-05-23 13:06:31 +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
shaiv-webkul
acfdd0f880
config field for password
2019-05-22 16:11:45 +05:30
rahul shukla
7888656d4c
down icon & product edit icon
2019-05-21 20:11:36 +05:30
rahul shukla
84b60e9081
comment of phone field in customer
2019-05-21 18:07:54 +05:30
rahul shukla
2d782cab79
issue #917 & #923
2019-05-21 10:51:39 +05:30
rahul shukla
f05d07eb38
issue #913 group in attribute family
2019-05-20 16:22:53 +05:30
jitendra
afb0b99723
Email sent option added in mail notification
2019-05-17 16:05:30 +05:30
jitendra
7931baab28
Email sent option added in mail notification
2019-05-17 15:31:39 +05:30
prateek srivastava
39ae415148
admin Navigation bar menu scroll issue fixed
2019-05-10 11:34:25 +05:30
rahul shukla
d31179edaa
removal of space
2019-05-09 11:38:34 +05:30
rahul shukla
4c2a895b08
Issue #897 & change in valdation message for category image
2019-05-09 11:36:21 +05:30
rahul shukla
b52dc978e8
Admin section for IE & dyanamic footer content
2019-05-07 18:57:33 +05:30
rahul shukla
1b3653348d
front end changes for IE
2019-05-06 20:52:43 +05:30
Jiayu Shen
2816dd01e5
Merge branch 'master' into development
2019-05-01 22:38:42 +10:00
Jitendra Singh
52bc554e31
Merge pull request #895 from prateek-webkul/development
...
admin mail notification, review price
2019-05-01 17:58:12 +05:30
shenjiayu
8eea13db2d
utilise Mail::queue to send emails
2019-05-01 21:31:03 +10:00
rahul shukla
f942415ebb
sort order for payment methods
2019-04-30 19:02:56 +05:30
prateek srivastava
4c101aa646
admin mail notification, review price
2019-04-30 12:55:11 +05:30
rahul shukla
507a41546d
issue #890
2019-04-30 12:40:35 +05:30
rahul shukla
cc3323c55d
issue #891 description issue
2019-04-29 15:51:15 +05:30
rahul shukla
8019f49765
issue #879
2019-04-26 11:18:15 +05:30
rahul shukla
5e6131102b
issue #866 & #845
2019-04-25 14:11:49 +05:30
rahul shukla
75e74dfb7e
issue #867 shipment issue
2019-04-24 17:57:16 +05:30
rahul shukla
c4eb615328
issue #842
2019-04-23 18:53:41 +05:30
rahul shukla
e52c426600
dashboard & issue #841
2019-04-23 16:20:33 +05:30
jitendra
7a5c3f1bdc
Assets compiled for production
2019-04-23 12:58:47 +05:30
rahul shukla
148ff7c1e8
merge with master
2019-04-23 12:36:05 +05:30
Jitendra Singh
025a34d99f
Merge pull request #857 from jitendra-webkul/jitendra
...
Issue #840 fixed
2019-04-23 10:33:58 +05:30
jitendra
c585186a88
Issue #840 fixed
2019-04-23 10:33:10 +05:30
rahul shukla
560d1fb0bc
issue #856
2019-04-22 20:52:36 +05:30
rahul shukla
0239b7ec0b
issue #846
2019-04-18 20:22:37 +05:30
rahul shukla
148f942c4a
issue #848
2019-04-18 19:15:14 +05:30
prateek srivastava
5b01493d26
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-18 13:04:10 +05:30
prateek srivastava
16b2b2a01f
scroller fixed
2019-04-18 12:58:35 +05:30
jitendra
580d3ddf65
Resolve conflict
2019-04-18 12:56:36 +05:30
jitendra
e99daf28e2
Issue #834 fixed
2019-04-18 12:52:51 +05:30
prateek srivastava
df8f54597a
scroller code removed
2019-04-17 12:30:50 +05:30
prateek srivastava
eb5bad16ff
removed code for scroller
2019-04-17 12:24:41 +05:30
rahul shukla
ad6acfa7e0
issue #824
2019-04-16 20:15:28 +05:30
rahul shukla
ae6d498f4c
merge with master
2019-04-16 19:22:49 +05:30
prateek srivastava
558b416bb6
Merge branch 'development' of https://github.com/prateek-webkul/bagisto into development
2019-04-16 19:22:03 +05:30
rahul shukla
095c045c58
change table of product datagrid to product_flat
2019-04-16 18:59:29 +05:30
rahul shukla
a4bb5a036b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-16 15:55:42 +05:30
Jitendra Singh
3984d92fad
Merge pull request #828 from prashant-webkul/development
...
Development
2019-04-16 15:46:32 +05:30
Jitendra Singh
a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
...
Issue #803 fixed
2019-04-16 15:41:39 +05:30
jitendra
eb00f36835
Issue #803 fixed
2019-04-16 15:40:58 +05:30
rahul shukla
d568ea4bbe
merge with master
2019-04-16 15:35:54 +05:30
Prashant Singh
53ebbf5a1e
Removed product grid events, product grid table is now obselete and maybe used in future for someother purposes. In result we will have a faster product creation and a new grid will be added with product flat table
2019-04-16 14:47:28 +05:30
Prashant Singh
36f6c425c2
Assets compiled for production
2019-04-15 15:14:32 +05:30
Prashant Singh
feaaaa89a5
fixed some style issues
2019-04-14 15:30:43 +05:30
rahul shukla
44c898824e
removed duplicate entry in product linking
2019-04-12 18:43:42 +05:30
rahul shukla
2a859b7e23
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-10 15:08:15 +05:30
rahul shukla
b99b0ad8b5
product attribute & category menu
2019-04-10 15:08:01 +05:30
prateek srivastava
f2def6c4bc
scroller issue fixed
2019-04-09 19:28:44 +05:30
rahul shukla
b6a1a05e66
added permission of add & delete in acl
2019-04-09 18:52:03 +05:30
naresh verma
b0296a02e0
inventory source mail
2019-04-09 17:04:20 +05:30
Prashant Singh
1ca1ae5b61
Changed responses for all backend destroy functions and removed dead commented code
2019-04-09 13:17:19 +05:30
Prashant Singh
b3bf66c6e2
Base sync with master
2019-04-09 12:53:31 +05:30
Prashant Singh
75ef9cd530
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-09 12:50:09 +05:30
Prashant Singh
6c74b2ca42
admin assets compiled for production
2019-04-09 06:33:36 +05:30
Prashant Singh
6a4cb016c4
fixed issue #750
2019-04-09 06:31:52 +05:30
Prashant Singh
2df1a84191
Security fix underway need pull from other branches
2019-04-08 19:46:19 +05:30
rahul shukla
efd38ab99e
issue #718
2019-04-08 19:33:23 +05:30
rahul shukla
4bd89950ce
change update & delete query in controller & comment added
2019-04-08 16:48:43 +05:30
Prashant Singh
747f214739
fix in progress for get routes performing actions more than redirect
2019-04-08 04:51:02 +05:30
Prashant Singh
1e6579bedf
in fix
2019-04-05 19:38:44 +05:30
Prashant Singh
dadbf2bd6a
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-04-05 10:47:16 +05:30
rahul shukla
4c2a0a08fc
email subscription & newsletter verifiaction
2019-04-04 19:34:01 +05:30
Prashant Singh
5c94a8a21f
changed name of folder from 'sass' to 'scss' inside packages Admin, Shop & Ui
2019-04-04 14:50:59 +05:30
prateek srivastava
504a5ec038
issue fixed #791
2019-04-03 18:03:11 +05:30
prateek srivastava
1cb03f9ac3
admin scroller bug fixed
2019-04-03 15:23:12 +05:30
Jitendra Singh
3dee0678f7
Merge pull request #788 from imanghafoori1/flatten_foreach
...
flatten code
2019-04-03 14:49:22 +05:30
Jitendra Singh
d0e5e6a88f
Merge pull request #786 from imanghafoori1/flatten_code
...
Flatten code
2019-04-03 14:49:06 +05:30
Iman
759782c735
fix doc blocks ( #787 )
2019-04-03 12:34:35 +05:30
prateek srivastava
b655a848d7
admin scroller bug fixed
2019-04-03 12:17:23 +05:30
rahulshukla-webkul
9314d9159c
Development ( #789 )
...
* issue #753 swatch issue
* edit validation for swatch
* #783 product image with installer
* issue #773
* removal of view composers in shop
2019-04-03 11:37:48 +05:30
imanghafoori
fadd26bd13
flatten code
2019-04-02 22:10:34 +03:30
imanghafoori
14cd4eb97e
flatten code
2019-04-02 21:50:44 +03:30
Prateek Srivastava
f2e4930e8e
admin nav left menu scroll bug fixed ( #784 )
...
* admin nav left menu scroll bug fixed
* scroller
* scroller
* fixed syntax for PR #784
2019-04-02 18:26:31 +05:30
prateek srivastava
1492022c20
fixed syntax for PR #784
2019-04-02 18:24:43 +05:30
prateek srivastava
896b4eebc3
scroller
2019-04-02 18:07:54 +05:30