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

758 Commits

Author SHA1 Message Date
mergify[bot]
59e67cd384
fix: make project page translatable (backport #37743) (#37801) 
fix: make project page translatable

(cherry picked from commit e72afd0bd6c0b6100834888329f5bf985a826b65)

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-10-31 19:49:45 +05:30
rohitwaghchaure
d09618bf05
chore: remove debugger (#37584) 2023-10-19 12:35:36 +05:30
rohitwaghchaure
2851a41310
fix: Issues related to RFQ and Supplier Quotation on Portal (#37565) 
fix: RFQ and Supplier Quotation for Portal
 2023-10-18 16:31:35 +05:30
Sabu Siyad
f900a78995
refactor!: drop ecommerce in favor of webshop (#33265) 
* refactor!: remove ecommerce item group field check

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `e_commerce` directory

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `get_context` from `item_group`

https://frappeframework.com/docs/v14/user/en/guides/portal-development/context

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove related `./templates`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(navbar): remove wishlist (ecommerce)

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(js): remove js from scripts

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `www/all-products`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove pages and js

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove js/customer_reviews

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(portal utils): remove shopping cart debtor account

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove e_commerce events from hooks

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(web): remove e_commerce js from bundle

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(setup): remove shopping cart setup

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove pages

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(item): remove website item button

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(payment request): remove `on_payment_authorized`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: @staticmethod `get_gateway_details`

to avoid monkey patching, in custom apps
https://discuss.erpnext.com/t/how-to-override-method-in-frappe/28786/36

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(pages): remove product page

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(homepage): do not setup website items

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(workspace): remove link to ecommerce settings

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(www): remove shop-by-category

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(homepage): remove featured product

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: remove products in homepage

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(homepage): remove explore button

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: remove products fields from homepage

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* Revert "refactor!: @staticmethod `get_gateway_details`"

This reverts commit 561bcd96680a930bb92627869502d9346b10611b.

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove payment gateway e_commerce import

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* chore: pre-commit

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: pass `party` into `get_price`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: move `get_item_codes_by_attributes` to `utilities/product`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(quotation): input customer group

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* chore: pre-commit

* refactor: remove custom `navbar_items.html`

* refactor!(item): remove `published_in_website`

* refactor: move `validate_duplicate_website_item` before rename

* test: remove `test_shopping_cart_without_website_item`

* chore: add doctype drop patch

* refactor: removed website item related code

* refactor: removed shopping_cart code

* refactor: removed e-commerce related patches

* refactor: removed website related fields from item group

* fix: patch create_asset_depreciation_schedules_from_assets, KeyError: '0K BU64 AUY'

---------

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2023-10-17 17:05:44 +05:30
s-aga-r
afef9dc8df
Merge pull request #37182 from s-aga-r/MOVE-PAYMENTS-GATEWAYS 
refactor!: move payment gateways to the payments app
 2023-10-14 16:48:11 +05:30
David Arnold
fa8483fe8c
fix(portal): used rounded total in transaction rows, if enabled 2023-10-02 17:46:39 +02:00
s-aga-r
9554f6ea3c refactor!: remove GoCardless Templates 2023-09-22 19:04:51 +05:30
rohitwaghchaure
e6199dc802
fix: allow to select parent warehouse in the website item (#37047) 2023-09-20 17:27:35 +05:30
Babuuu
89e89de961
Fix tax amount in customer portal (#36453) 
The net total is the value that is currently being displayed instead of the tax amount.
 2023-08-15 08:54:06 +05:30
Raffael Meyer
21080afd92
feat(RFQ): make email message fully configurable (#36353) 
feat: make RFQ message fully configurable
 2023-08-07 17:12:31 +05:30
Deepesh Garg
c6b024c34b
Merge pull request #36167 from barredterra/percentage-rounding 
fix: rounding of percentage fields
 2023-07-30 14:41:30 +05:30
Deepesh Garg
30554301c9
Merge pull request #36235 from resilient-tech/fix-tax-breakup-for-diff-tax-rates 
fix: Correct Tax Breakup for different tax rates for same hsn code
 2023-07-24 20:57:26 +05:30
Deepesh Garg
3f81e15672
Merge pull request #36147 from deepeshgarg007/eslint 
refactor(ci): add eslint and update linting confs
 2023-07-24 20:55:07 +05:30
DaizyModi
b84deec601 fix: Correct Tax Breakup for different tax rates for same hsn code 2023-07-21 17:43:27 +05:30
barredterra
ecaf0aba3c fix: rounding of percentage fields 
Always round with precision of 2
 2023-07-17 16:45:11 +02:00
Sagar Vora
bccb718cc2 chore: use consistent quotes 2023-07-17 15:45:36 +05:30
Deepesh Garg
3fa2a8c2d8 chore: fix linting issues 2023-07-15 18:03:16 +05:30
rohitwaghchaure
0e14ea4e32
Merge pull request #35881 from rohitwaghchaure/fixed-serial-batch-bundle-print 
fix: serial and batch bundle values in the standard print format
 2023-06-26 16:21:34 +05:30
Rohit Waghchaure
9cf645e07f fix: serial and batch bundle values in the standard print format 2023-06-26 16:00:53 +05:30
Rohit Waghchaure
32965f1af9 fix: stock error for service item 2023-06-20 16:27:23 +05:30
Deepesh Garg
534ea5ad21
fix: Add offers info to website item (#34873) 
* fix: Add offers info to website item

* Revert "fix: Add offers info to website item"

This reverts commit 88b598edb61f0ab97b751581cc2719964e169055.

* fix: Add offer properties to website item
 2023-04-17 16:35:22 +05:30
Ritwik Puri
f193393f57
fix!: require sender and message for contact us page (#34707) 
* fix: require sender and message for contact us page

* refactor: dont override frappe.send_message from client side

used override_whitelisted_method hook for the same
 2023-04-05 12:04:36 +05:30
Rohit Waghchaure
aaa4d1eb55 fix: E-commerce issue with Item Variants 2023-03-21 14:44:12 +05:30
s-aga-r
20bdc63b03 fix: show Purchase Order Portal Pay button based on configuration 2023-02-15 20:14:39 +05:30
Rohit Waghchaure
7800db7c0d fix: web supplier quotation 2023-01-23 14:21:10 +05:30
Sabu Siyad
010718ffed
fix(ecommerce/cart): explicitly set frappe.boot (#33431) 
related: https://github.com/frappe/frappe/pull/18323

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2023-01-02 08:58:01 +05:30
ruthra kumar
9fd70a6827
Merge pull request #33115 from ruthra-kumar/duplicate_schema_block 
fix: remove product schema block from additional info section on item template
 2022-11-28 15:28:50 +05:30
ruthra kumar
2c18a95115 fix: remove duplicate schema 2022-11-25 16:23:45 +05:30
Saurabh
5d9960ae5b feat: handle empty state 2022-11-21 19:37:57 +05:30
Saurabh
80e45828ae fix: ux for project view on web 2022-11-21 18:16:57 +05:30
Ankush Menat
07c4a74838
chore: drop stale demo page (#32515) 2022-10-06 13:01:53 +05:30
Summayya Hashmani
da43a5e371
refactor(UI): clean up portal pages (#29018) 
* refactor: list view for portal pages

* refactor: add align center class

* refactor: change footer btn class(primary)

* refactor: add order style page

* refactor: import order page in website

* refactor: remove table elements

* fix: preview image height

* fix: make string translatable

* refactor: change font variables

* refactor: order preview bg white

* refactor: center align items

* fix: breadcrumb padding

* refactor: make preview image rounded

* refactor: add condition for image container

* refactor: change alignment for mobile view

* fix: make footer button secondary

* refactor: clean code

* refactor: code indentantion

* refactor: remove space

* fix: Payment section cleanup

Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2022-10-04 09:57:07 +05:30
Sagar Sharma
80080a3d7b fix: show Make Purchase Invoice button based on permission 2022-09-28 15:40:07 +05:30
Ankush Menat
4a38ce659d refactor!: drop redisearch 
incr: replace text and tag fields

incr: use rediswrapper's make key

incr: indexDefinition from redis

incr: replace index creation

incr: replace AutoCompleter

incr: replace product search ac

incr: replace client querying

fix: broken redisearch load test

fix: pass actual query to get suggestion
 2022-08-31 17:06:20 +05:30
Ankush Menat
08d7c48dc7
refactor: use browser native lazy loading (#31814) 2022-08-09 18:49:14 +05:30
Marica
56db91b322
Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-27 14:12:09 +05:30
mergify[bot]
5b7b58322f
fix: hero image not loading in portal homepage (backport #31699) (#31700) 
fix: hero image not loading in portal homepage (#31699)

(cherry picked from commit 8a6432ec3f4bf63c39d1f687f618cec2360ebccf)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-07-26 13:46:03 +05:30
Marica
d2d651a0c3
Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-25 12:43:08 +05:30
Rucha Mahabal
f765428757 chore: Remove HRMS templates 2022-07-14 11:59:06 +05:30
Marica
681b334236
Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-11 11:22:51 +05:30
Suraj Shetty
c9dc902dee
Merge branch 'develop' into update-library-usage 2022-07-07 09:40:21 +05:30
Suraj Shetty
f0e8a518cd fix: Update font awesome path 2022-07-06 15:10:39 +05:30
Suraj Shetty
32fd753a14 fix: Update html2text import path 2022-07-06 15:09:44 +05:30
Marica
b58d7d1c89
Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-06 14:43:23 +05:30
Marica
1a749e2589
Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-06-29 10:25:30 +05:30
marination
9541354ec7 chore: Make image field obsolete in Website Item (redundant) 
- Delete Image field and set `website_image` as form's image field for uploads
- Remove instances of `image` field access via Website Item
- Item -> Web Item via Desk: Map Item's `image` to Web Item's `website_image`
- Item -> Web Item via patch: `website_image` will be mapped with thumbnail
- Remove magic that auto-sets `website_image` from `image` in Website Item
 2022-06-27 13:00:00 +05:30
Sagar Vora
7f390fb755 Merge branch 'develop' into remove-india 2022-06-26 18:10:44 +05:30
Nabin Hait
f904ac599e fix: merge conflicts and sider issues 2022-06-25 11:40:23 +05:30
Sagar Vora
ec9861266e Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-19 22:57:22 +05:30
Conor
00ef499739
refactor: use db independent offset syntax (#31345) 
* chore: use db independent offset syntax

* fix: typo

* style: reformat code to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-14 10:49:07 +05:30