a29409b1a4
Base sync
2019-08-19 16:11:09 +05:30
e2bd18e916
Resolved conflicts
2019-08-19 16:01:38 +05:30
e5b904741c
Merge pull request #1316 from prashant-webkul/development
...
Catalog rule implementation complete, new product price mechanish rem…
2019-08-19 15:11:13 +05:30
e97069d2be
Catalog rule implementation complete, new product price mechanish remaining
2019-08-19 15:05:56 +05:30
29e4851bfb
Group product added
2019-08-19 15:00:24 +05:30
b7bc6344bb
Merge pull request #1313 from prashant-webkul/development
...
Development
2019-08-19 13:56:04 +05:30
8a9198e5d9
Catalog rules tie break in progress, squased a line of dead code in CartRuleController
2019-08-19 12:36:43 +05:30
aca7b4c6c7
Catalog rule tie breaker content in progress
2019-08-17 20:18:39 +05:30
1d1018ac50
Refactoring of cart rules and syntax standard sugar
2019-08-17 17:40:17 +05:30
a8ff894d6c
Merge pull request #1310 from prashant-webkul/development
...
Fixed channel locale issue in cms datagrid
2019-08-17 15:49:18 +05:30
bb972c6e48
CMS Bug fixes and updated readme
2019-08-17 15:42:24 +05:30
eb2f805057
Correct name of channel column in CMS page datagrid
2019-08-16 19:18:00 +05:30
b87e6cdb2e
Fixed channel locale issue in cms datagrid
2019-08-16 18:48:13 +05:30
59cfd13795
Merge pull request #1307 from prashant-webkul/development
...
Development
2019-08-16 17:50:18 +05:30
bd6e0c9345
Structural changes in CMS pages. Fixed bugs #1300 , #1295
2019-08-16 17:43:58 +05:30
8c96bca9b3
Base sync
2019-08-14 16:54:13 +05:30
44c33825e0
Cart discount helper namespace fix
2019-08-14 16:53:05 +05:30
39a195f923
Merge pull request #1296 from prashant-webkul/development
...
Development
2019-08-14 14:55:44 +05:30
de24f9a39c
Fixed issue #1292 for CMS pages by making a separate view for helper classes and leaving future scope for things as well
2019-08-14 14:01:49 +05:30
da5ad23c3b
Fixed issue #1289
2019-08-14 13:50:32 +05:30
c56a791069
Fixed issue #1295
2019-08-14 13:49:42 +05:30
54e54918a7
Fixed issue #1293
2019-08-14 13:44:21 +05:30
9425b39b78
Fixed issue #1294
2019-08-14 13:42:27 +05:30
dd9ff1629d
Fixed issue #1287
2019-08-13 23:31:14 +05:30
d875855145
Update app.php
2019-08-13 10:33:30 +04:30
2a36c6bd0e
Catalog rule implementation in progress
2019-08-12 19:23:33 +05:30
da093662db
Catalog rule implementation in progress
2019-08-12 06:56:21 +05:30
1b86cd99f1
Create Persian language file
2019-08-10 10:24:54 +04:30
06a4f1216b
Dead code removal
2019-08-09 19:29:28 +05:30
a849ae9fc0
Merge pull request #1272 from prashant-webkul/development
...
Development
2019-08-09 19:12:44 +05:30
8b78105ed9
Removed dead code
2019-08-09 18:52:01 +05:30
a72535db23
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-08-09 14:17:09 +05:30
3ca4b48ac3
Catalog rule update form in progress
2019-08-09 04:10:45 +05:30
55ead412ce
Catalog rule create form implemented
2019-08-08 11:38:23 +05:30
6d41d37c3b
Catalog rules migrations finalized
2019-08-08 07:28:08 +05:30
fbedc8a161
Added env's shop_mail_from param param in all mails related to customers and shop
2019-08-06 20:00:28 +05:30
6a8bb7982d
Base sync
2019-08-06 14:37:03 +05:30
063a58b753
Issue #1253
2019-08-05 21:00:39 +05:30
763a380870
new customer notification, isssue #1247
2019-08-05 20:23:48 +05:30
cff0b7f4b2
refactroring of vart rules
2019-08-05 05:06:51 +05:30
e4a5e84fb6
Refactoring cart rules
2019-08-03 19:54:02 +05:30
9ca97aa594
CMS implemented
2019-08-02 19:51:28 +05:30
b1285fa243
Static page CMS sprint one complete, preview page is not loading CSS and JS from shop layout
2019-08-02 04:30:19 +05:30
6f64de0f26
issue #1235
2019-07-31 19:19:26 +05:30
561803cd3c
filterable attribute for category, tax price update on cart and issue #1234
2019-07-31 17:44:29 +05:30
3a7e481d01
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-30 20:09:55 +05:30
270bdfa553
delete in product flat
2019-07-30 20:09:40 +05:30
d8086091cb
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-07-30 13:54:25 +05:30
39139f26ca
Issues #1228 and #1229
2019-07-30 13:45:13 +05:30
41510db280
Merge pull request #1202 from moe2566/master
...
Add text direction configuration for locales
2019-07-30 11:48:56 +05:30
1b95d3d877
product creation on channel based and admin logo
2019-07-30 10:36:26 +05:30
d83396d437
issue #1217 , #1220 and #1218
2019-07-29 14:38:17 +05:30
2e336c935a
test field added for depandenet field in configuaration
2019-07-29 14:34:54 +05:30
9d9b0b5176
use in product flat column added in attributes
2019-07-29 14:33:33 +05:30
dbff16b8b7
disabale zoom on mobile devices
2019-07-29 12:07:39 +05:30
f9e91bb0ef
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-07-25 11:26:34 +05:30
09cfa77378
Update anonymous-master.blade.php
2019-07-24 10:19:50 -04:00
1dd5faa21d
change Datatype for code
2019-07-24 17:55:32 +05:30
a0ba845e37
Add text direction configuration for locales
2019-07-23 18:05:57 -04:00
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
dfd6ea8c25
Translations fixes in promotions sections
2019-07-23 13:07:22 +05:30
70267e29cb
disabled catalog rule
2019-07-22 13:01:54 +05:30
0bd422db97
translation fixes in cart rule forms
2019-07-22 13:01:07 +05:30
9cf1ea2516
disabled catalog rule till final migrations
2019-07-22 12:54:46 +05:30
896cbfe1e0
base sync
2019-07-22 12:53:51 +05:30
27ca4cb622
Minor fixes
2019-07-22 12:50:06 +05:30
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
3200cbafc6
Issue #1190 .
2019-07-19 16:30:01 +05:30
bcdec8ec5a
Removed old migrations of catalog rule and removed a bug in convertXToProductId
2019-07-19 15:44:15 +05:30
a9994a3143
Translation issue fixes for cart rule create and edit forms
2019-07-19 10:49:19 +05:30
48d068d760
ConvertXToProductID bug fix when left null
2019-07-18 18:20:21 +05:30
b512666ef1
ConvertXToProductId from attributes implemented
2019-07-18 14:08:36 +05:30
f61554c5a6
configuration changes for dependent field
2019-07-18 12:51:22 +05:30
247b662b7e
Position fixes for buttons used in tabbed forms
2019-07-18 10:45:59 +05:30
52e3a64380
Made all submit buttons of create and update buttons style to fixed
2019-07-18 10:10:49 +05:30
2a9b4220d6
Only finding product ids is left then apply them on cart rules
2019-07-17 18:54:43 +05:30
3d53a221ef
Has options check applied on frontend for options related to select and multiselect attributes
2019-07-17 16:18:10 +05:30
4017e3b16e
ConvertXToProductId frontend complete now moving to converting X to ids
2019-07-17 16:14:04 +05:30
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
6ba5e0df0a
Added back catalog rule migration, a bug is stuck in convert x to productid migrations
2019-07-15 19:54:38 +05:30
93a035b147
Fixer io disabled temporarily
2019-07-15 18:25:14 +05:30
c6bc5ba1c3
Added support for fixer for fetching rates
2019-07-15 18:24:36 +05:30
27d6e8894c
checkbox type attribute
2019-07-15 18:00:56 +05:30
9f9e0b6a68
Created a command to activate the usage of catalog rule
2019-07-15 16:02:39 +05:30
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
0d0a588c33
added products subselection in cart rules create page(in progress 50% done)
2019-07-14 17:20:09 +05:30
d860466dfc
mass action index now totally dependent on datagrid's index property
2019-07-14 14:30:44 +05:30
caf165d06c
Fixed issue with image of product card getting cropped due to CSS
2019-07-14 12:25:57 +05:30
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
5f08f2b9f4
Fixed sort order for configuration in admin panel
2019-07-14 00:46:33 +05:30
f8c774b3a5
Started with convert x to product id for cart rules
2019-07-13 15:23:27 +05:30
88611c9d84
Fixed issue #1172
2019-07-11 09:49:32 +05:30
abd3913d45
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-10 10:37:29 +05:30
cc4dfcad76
issue #1160 , filterable attribute & configuration updated for validation
2019-07-09 14:47:40 +05:30
68bba4d7e2
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-07-09 12:54:42 +05:30
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
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
746a17dcf6
conflict resolve
2019-07-08 13:13:34 +05:30
c7add7e2fe
removal of excess code in search, locale & currency
2019-07-08 13:10:41 +05:30
2c45ddee13
Merge pull request #1157 from danielpinon/patch-1
...
Updating translations of languages in pt_BR
2019-07-08 12:13:54 +05:30
723f6ad639
Clearing duplicity
2019-07-06 23:59:59 -03:00
c5fe78014c
Updating translations of languages in pt_BR
2019-07-06 23:58:01 -03:00
c8e8df1699
Added configuration for cart rules
2019-07-06 17:41:58 +05:30
54481ebbfe
slider edit issue
2019-07-05 18:15:22 +05:30
3fe220428c
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-05 13:23:56 +05:30
1fd25cfc92
Added currency symbol in currencies table
2019-07-05 11:46:45 +05:30
60435b724f
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-04 12:38:36 +05:30
c56d94f7a4
issue #968 and dependent field
2019-07-04 12:38:20 +05:30
f8d38e9bbd
Enabled usage parameters of cart rule in create and edit form
2019-07-03 11:37:09 +05:30
31b6e779d6
Fixed image wrapper css issue
2019-07-02 17:55:56 +05:30
12c321e80e
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-07-02 12:45:59 +05:30
bfe52a7d3c
Enabling coupon usage option for cart rules and start of the program convertxtoproductid
2019-07-02 12:45:30 +05:30
366a5fdd20
Refactor code standard
2019-07-01 17:03:36 +05:30
3d352b690a
Merge branch 'master' of https://github.com/bagisto/bagisto
2019-06-29 18:49:08 +05:30
1057cd654e
Updated preorder in SAAS
2019-06-29 18:19:39 +05:30
2f905203a2
style for dashboard
2019-06-29 18:12:07 +05:30
f08a8036e6
Resolved conflict
2019-06-29 17:57:10 +05:30
3ef416b22e
Added downloadable order item info
2019-06-29 17:51:49 +05:30
b8c0f4aed6
css changes for overflow
2019-06-29 15:26:26 +05:30
ad6e422fdb
Added downloadable and virtual products
2019-06-29 15:23:34 +05:30
55b71e1e66
updated
2019-06-28 19:48:52 +05:30
34fd4e3840
assets compile for production
2019-06-28 17:11:26 +05:30
beabada35e
acl added for cart rule & dashboard css changes
2019-06-28 16:30:36 +05:30
8a5d57bcc6
new compiled assets for production
2019-06-28 16:30:36 +05:30
fce7ec8586
Assets compiled for production and updated the changelog for new release v0.1.6
2019-06-28 16:29:41 +05:30
25007824eb
Shipping now getting applied according to selected shipping method
2019-06-27 19:51:17 +05:30
4feeffaf51
Merge pull request #1124 from prashant-webkul/development
...
Fixed issue #1080
2019-06-27 16:18:13 +05:30
9b83fb8025
Fixed issue #1080
2019-06-27 16:14:24 +05:30
9eaf46a4d1
Merge pull request #1123 from prashant-webkul/development
...
Product export now added
2019-06-27 14:59:42 +05:30
487484f86d
Product export now added
2019-06-27 14:55:32 +05:30
4627c6a519
Merge pull request #1122 from prashant-webkul/development
...
Development
2019-06-27 14:43:51 +05:30
c245eab856
Fixed issue #1086 for customer edit
2019-06-27 14:41:01 +05:30
79b5e1c4cd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-27 14:38:48 +05:30
a9090e991c
download for image & file type
2019-06-27 14:38:24 +05:30
d1395ba145
Fixed issue #1086
2019-06-27 14:24:26 +05:30
3f79f2b89a
Fixed issue #1114 , #1112
2019-06-27 13:30:45 +05:30
2a5e8b1ddd
Removed propaganistas/laravel-intl dependency
2019-06-27 13:01:47 +05:30
62cb90e014
status for customer
2019-06-26 18:02:14 +05:30
a60e339218
Merge pull request #1105 from prashant-webkul/development
...
Development
2019-06-25 15:02:46 +05:30
68c22f38f6
improvements in cart rules
2019-06-25 14:44:14 +05:30
1a262e0f27
Fixed some bugs in cart rules
2019-06-25 12:27:13 +05:30
eedc0c6153
eliminated the column is_guest column from cart rules in favor of guest as a customer group
2019-06-25 11:10:21 +05:30
d547ab5058
Merge pull request #1090 from prashant-webkul/development
...
Development
2019-06-21 16:28:59 +05:30
9080f1e278
removed inline css
2019-06-21 11:37:31 +05:30
b0c35ead9f
icon issue in admin dashboard
2019-06-21 11:23:27 +05:30
8c9fb32ab1
Removed some deadcode of productgrid repository which is no longer needed and had been obselete from many days
2019-06-21 04:15:45 +05:30
937d91ea5b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-20 18:10:07 +05:30
048585853d
repository insted of model in attribute create & edit for locale
2019-06-20 15:12:28 +05:30
bfac46ffdf
Merge pull request #1079 from rahulshukla-webkul/development
...
issue of discount amount in order #1053
2019-06-20 14:34:11 +05:30
264d2e3c9e
Added cart rule validation function which validates the cart rule and added unique coupon check while creating or updating couponable cart rule
2019-06-20 13:03:01 +05:30
f72529f0fb
issue of discount amount in order #1053
2019-06-20 12:17:11 +05:30
acad17af67
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-19 18:21:26 +05:30
052afb4faf
Fixed issues with apply to shipping and free shipping in create and edit of cart rules
2019-06-19 18:18:21 +05:30
423824b531
Fixed issue #1075 and #1074
2019-06-19 18:13:41 +05:30
5b98b9a86d
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-19 16:32:48 +05:30
be8c11aa98
issue #1069
2019-06-19 16:32:38 +05:30
de445279d2
Fixed bug in product creation changed the name of product type configuration file and implemented new design for condition fields in create and edit pages of cart rules
2019-06-19 16:27:32 +05:30
68e0ba1ac1
Fixed issue #1054
2019-06-19 10:58:02 +05:30
d25cc60351
issues #1056 & 1058
2019-06-18 18:05:52 +05:30
9166daa31b
issues #1056 & 1058
2019-06-18 17:58:34 +05:30
1144ce7e10
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-17 18:32:12 +05:30
94b67d00c1
admin css changes
2019-06-17 18:31:52 +05:30
0b5f50f1b0
depandent field added in configuaration
2019-06-17 18:22:23 +05:30
d18667351c
Base sync
2019-06-17 12:38:29 +05:30
ea185aad7b
Discount package bug fixes and complete refactor with overriding features for actions
2019-06-17 08:56:30 +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
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
545cd7386e
Revert "Revert "Fixed issue with order summary rendering on cart page""
2019-06-15 16:49:02 +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
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
1e865986c4
improved conditions check in applying cart rules
2019-06-14 19:24:15 +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
5afef79ac2
merge with master
2019-06-13 20:24:52 +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
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
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
ec27ed4c8d
added credit max in configuration
2019-06-13 01:05:29 +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
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
8e37ebe7d5
conflict resolve
2019-06-10 17:13:30 +05:30
80ac7bba72
customer document
2019-06-10 17:11:56 +05:30
0d3539f3c9
fixed validation issues in cart rule #993 & #997
2019-06-10 15:29:19 +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
Prashant Singh
jitendra
Jitendra Singh
Hossein
rahul shukla
moe2566
Daniel Pinon
Prashant Singh