Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,100 Commits 3 Branches 0 Tags 1 GiB
b85d3017a1
Commit Graph

203 Commits

Author SHA1 Message Date
Nabin Hait
5b462ad11a fix: merge conflict 2021-06-24 15:36:51 +05:30
marination
820a579051 chore: Test for Item visibility in multiple item group pages 2021-06-24 13:57:18 +05:30
marination
4f0e6cd911 fix: Sider 2021-06-24 13:57:00 +05:30
marination
f913838373 fix: Consider Table Multiselect fields in Query engine 
- Since table multiselect fields were not handled, the query tried searching for this child field in item master
- This broke the query
- On trying to reload or go back to all-products page with field filters that are table mutiselect, page breaks
 2021-06-24 13:56:49 +05:30
marination
9f305e983c fix: Filters did not consider Website Item Group 2021-06-24 13:56:35 +05:30
marination
ea2408744a fix: Consider Website Item Groups in Item group page product listing 
- Passed an argument to query engine to know when query is for item group page
- If for item group page, get data with regards to website item group table
- This query should be fast since there's one filter and that shortens the table beforehand
- This data is merged with the results from the Item master (results only considering item attributes and field filters)
- The combined data is then sorted as per weightage

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
 2021-06-24 13:56:15 +05:30
marination
c212d7fafd fix: Sort website products by weightage mentioned in Item master 2021-06-22 11:20:23 +05:30
Suraj Shetty
175cb27bcb test: Pass ConflictingTaxRule during tax rule test 2021-05-28 09:09:36 +05:30
Suraj Shetty
142ec9e99e test: Pass ConflictingTaxRule during tax rule test 2021-05-08 19:03:53 +05:30
Ankush Menat
adf974810d
fix: equality check instead of assignment in cart 2021-04-16 21:15:50 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Sagar Vora
9967a7ce02
test: clear all existing quotations to avoid AssertionError (#25202) 2021-04-05 15:35:52 +05:30
Sagar Vora
9a0907131a
test: create tax rule if it doesnt exist (#25199) 2021-04-05 14:50:09 +05:30
Ankush Menat
7d892438f0
fix: track setting changes 2021-03-02 17:50:58 +05:30
marination
e2d0715cdf fix: Server side validation for missing payment gateway account 2021-02-11 19:06:10 +05:30
marination
8615227090 fix: Shopping cart breaks without Payment Gateway Account 2021-02-11 18:51:35 +05:30
prssanna
fd0e8a4e23 fix: also fetch item variants if hide variants is disabled 2021-02-10 16:31:41 +05:30
Prssanna Desai
b8f4cdfbce
Merge pull request #24555 from prssanna/product-query-fix 
fix: check if product_info exists
 2021-02-05 14:54:23 +05:30
prssanna
a7820f310c fix: check if product_info exists 2021-02-05 14:52:31 +05:30
Nabin Hait
7177579051
fix: Dependant sle logic fixes (#24489) 
* fix: Dependant sle logic fixes

* fix: negative qty validation

* fix: Travis fixes
 2021-02-02 22:03:07 +05:30
prssanna
a3585e40f7 style: fix formatting 2021-02-01 19:50:27 +05:30
prssanna
7863118994 fix: docs link for store page in shopping cart settings 2021-02-01 18:57:30 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
Anupam Kumar
0d9a8ae4d2
feat: shopping portal changes (#24445) 
* feat: shopping portal changes

* fix: review changes

* review changes
 2021-01-28 17:32:57 +05:30
prssanna
2aa1efb70e fix: broken image style 2021-01-22 15:31:38 +05:30
prssanna
b00eb1b0cc feat: shopping cart page 2021-01-20 17:52:54 +05:30
prssanna
ac7bc78afe fix: show product price in item card 2021-01-20 17:46:19 +05:30
prssanna
599322871a fix: product query issues 2021-01-20 17:44:08 +05:30
Shivam Mishra
31a651365d feat: update item group website slider 2020-12-30 15:51:34 +05:30
Shivam Mishra
355943c3a0 feat: only show attributes that have an item 2020-12-29 17:46:18 +05:30
Shivam Mishra
2a6c4ec26e chore: remove dead code 2020-12-29 17:20:12 +05:30
Shivam Mishra
298608ef40 feat: add product filters generator for item group and all products 2020-12-29 17:17:44 +05:30
Shivam Mishra
ed21350871 fix: page limit filter bug 2020-12-29 17:17:18 +05:30
Shivam Mishra
2dd26f7551 chore: cleanup product query 2020-12-29 17:17:03 +05:30
Shivam Mishra
aa42886851 fix: template json 2020-12-29 13:28:35 +05:30
Shivam Mishra
c640065a66 feat: cleanup json 2020-12-28 12:16:29 +05:30
Shivam Mishra
c54aca3f44 chore: cleanup comments 2020-12-24 18:02:50 +05:30
Shivam Mishra
a90b6a73dd fix: syntax error 2020-12-24 18:02:07 +05:30
Shivam Mishra
419c889a9a feat: add docstrings 2020-12-24 17:58:18 +05:30
Shivam Mishra
293f483cb4 feat: add ProductQuery engine 2020-12-24 17:54:07 +05:30
prssanna
eb0e596d43 feat: store home page and product page 2020-12-24 11:40:33 +05:30
Shivam Mishra
7d3876d51a feat: shopping cart search 2020-12-22 11:17:14 +05:30
Shivam Mishra
721251f09f feat: add product category cards 2020-12-22 11:17:14 +05:30
Shivam Mishra
b4946c31b4 refactor: use h1 for slidetitle 2020-12-22 11:17:14 +05:30
Shivam Mishra
09c8aaa87a feat: add slider template 2020-12-22 11:17:14 +05:30
Shivam Mishra
fa102e4713 feat: add templates for online store 2020-12-22 11:17:14 +05:30
Suraj Shetty
ad57eef40c
fix(product-listing): Check if customer exists (#24030) 
- It might happen that perty_name might not always be Customer
(it might be Supplier as well)
 2020-12-01 09:14:57 +05:30
Mangesh-Khairnar
5c29eb08c4 Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration 2020-10-19 18:29:46 +05:30
Anupam
dd2f547c3b fix: Ui fixes 2020-09-24 16:37:08 +05:30
Anupam
78ee75d744 fix: review changes 2020-09-24 16:17:02 +05:30