Commit Graph

187 Commits

Author SHA1 Message Date
Anupam
a4df105813 fix: UI fixes 2020-09-24 13:21:54 +05:30
Anupam
c077fac2a6 feat: provision to draft quotation from portal 2020-09-23 22:02:31 +05:30
Shivam Mishra
a0954e66a8 feat: add image alt argument for product_image macros 2020-08-07 14:34:54 +05:30
Shivam Mishra
f50312b6d2
fix: button sizing (#22777) 2020-07-22 16:17:11 +05:30
Anoop
5e16ca0326
fix: Login page doesn't load for new sites (#22388)
* fix: Login page doesn't load for new sites

Login page broken as active domains are not set for new sites

* Update footer_powered.html

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-23 11:11:13 +05:30
Shivam Mishra
25702a1c55 refactor: show service instead of services 2020-06-18 19:49:46 +05:30
Anupam Kumar
0a3c34de01
address label chages (#22137)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-06-17 10:53:13 +05:30
Deepesh Garg
dd78eb3842
Merge pull request #21252 from nextchamp-saqib/tax-breakup-for-cn
fix: show positive taxes in credit notes
2020-04-14 12:41:25 +05:30
Saqib Ansari
10a6a2d77f fix: show positive taxes in credit notes 2020-04-13 16:40:13 +05:30
Vishal Dhayagude
24e79b14e1
fix(shopping cart): UX Improvements (#21034)
* fix: nontype error for resolved and moved place order button at bottom left

* fix: removed inline style

* fix: Request for quotation move to lower right

* fix: move buttons

Co-authored-by: Naren <patilnarendra3@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:18:47 +05:30
Myuddin khatri
4635ff9368 fix(shopping-cart): address is made mandatory to place order 2020-03-12 14:45:08 +05:30
Rohan
395b2b15b2
fix: apply url encoding to project names (#20642) 2020-02-20 12:59:32 +05:30
thefalconx33
894c210027 fix: enable address without checkout feature
* fix add address form country link field
2019-12-11 17:43:04 +05:30
Suraj Shetty
519ca54f53 feat: Show timesheets related to customer's projects on customer portal (#19443)
* fix: Show timesheets related to customer's projects on customer portal

* style: fix codacy
2019-10-31 16:00:04 +05:30
gavin
ed8e3b3786 fix: link field country in shopping cart (#19370) 2019-10-21 18:12:29 +05:30
ashish-greycube
74dc3c99de feat: coupon_code and referral_sales_partner functionality 2019-10-15 11:44:45 +05:30
Faris Ansari
38ac7f7350 Enhancements to Supplier Portal (#19221)
* fix: Add Purchase Order to portal

* fix: Create Customer or Supplier on first login

Based on default role set in Portal Settings, a Customer or Supplier
will be created when the user logs in for the first time.

* fix: Styling for transaction_row

* fix: Styling for RFQ page

* fix: Add Purchase Invoice route

- Make Purchase Invoice from PO

* fix: minor

- Admissions for Student role
- Remove print statement
2019-10-09 11:41:33 +05:30
Shivam Mishra
8781dc8ca3 fix: footer link redirect to landing pages (#19181) 2019-09-26 12:53:52 +05:30
Shivam Mishra
c69cc13c85 fix: updated footer message (#18949) 2019-09-06 15:40:15 +05:30
Shivam Mishra
db3bb793e9 feat: added domain info on footer (#18839) 2019-08-26 11:29:18 +05:30
Shivam Mishra
eab5be1110 fix: shopping cart item availability 2019-08-20 19:31:54 +05:30
sahil28297
ec810a4a55 fix(product_page): compare type as well and provide base class for parseInt (#18332) 2019-07-15 11:24:41 +00:00
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997)
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
2019-07-03 10:34:31 +05:30
Faris Ansari
b8eaa3d377 fix: Issue list portal styling 2019-06-01 20:56:37 +05:30
Faris Ansari
358329d7df fix: Hide button and cart after success 2019-05-01 14:56:50 +05:30
Faris Ansari
5f1eebec16 fix(cart): Don't use window.open as it can be blocked
window.open calls are interpreted as popups by some browsers and are
blocked.

Also, route to Quotation web view instead of printview.
2019-05-01 14:32:15 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 (#15965)
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
2019-03-19 11:48:32 +05:30
Faris Ansari
853d3fd1ab fix: Don't use .format in jinja templates
- Jinja doesn't allow unicode strings to be formatted in templates
2019-01-23 16:34:22 +05:30
Nabin Hait
5a9579bae4 feat(quality): Check quality status before receipt/delivery (#16169) 2018-12-24 14:54:42 +05:30
deepeshgarg007
a9525de0da paid amount fix in fees 2018-11-26 20:34:32 +05:30
Shreya
8aca56836b fix(margin): Make user avatar display in line 2018-10-16 12:00:46 +05:30
Shreya
5c335550e3 Fetch item_group's name and image on website if children 2018-09-27 13:55:59 +05:30
Nabin Hait
a804d6d487 Fixed merge conflict 2018-08-29 13:34:58 +05:30
rohitwaghchaure
5c5688b374 Added provision to disabled in stock in products settings (#15133) 2018-08-16 10:33:28 +05:30
Rushabh Mehta
8705371ef0 fix(product-listing): fix variant selection in website 2018-08-16 09:22:45 +05:30
Solufyin
3be899caff Item Alternate Image Features in e-commerce site. (#15044)
* [ADD] Added Item Alternate Image Features in e-commerce site.

* [IMP] Improved Code for Item Alternate Image Feature.

* [IMP] Improved code for Item alternative image functionality.

* Remove .css file and make a build for erpnext-web.css

* Cleanup styling for item alternate image, also add delegated handler

* Spaces -> Tabs

* Spaces -> Tabs in item.html
2018-08-07 18:28:39 +05:30
Shreya Shah
83dfc0a2b1 Add Priority field in issue webform and portal (#14967) 2018-07-23 11:14:00 +05:30
Jamsheer
f926911399 [Enhance][Fix] Healthcare - DocType and Fields renaming (#14861)
* Rename DT - Physician Schedule Time Slot to Healthcare Schedule Time Slot

* Role name change

* Rename DT - Physician Schedule to Practitioner Schedule

* Rename DT - Physician Service Unit Schedule

* Rename DT - Physician to Practitioner

* Lab Test Template - field disabled in standard filter

* Patient - customer creation fix

* Rename DT - Consultation - Encounter

* Patches.txt updated for rename doctypes and fields in Healthcare

* Patch - Rename doctypes and fields in Healthcare Domain

* Fix - Patch - rename_healthcare_doctype_and_fields

* Vital Signs - New Fields - Abdomen, Tongue and Reflexes

* Web Form - Patient - Personal Details

* Rename DocType Physician to Healthcare Practitioner

* Rename DocType Consultation to Patient Encounter

* Web Form - Personal Details - Fix

* Web Form - Personal Details - Codacy Fix

* Healthcare patch run for all domain

* Rename label Practitioner to Healthcare Practitioner

* Rename Encounter to Patient Encounter
2018-07-16 18:08:53 +05:30
Prateeksha Singh
9a138f07f7 [portal] fix item-preview column #13077 2018-06-21 22:42:03 +05:30
Sushant Nadkar
565bf203e5 [Improvement] Added display settings for item price, availibility and stock levels (#14308)
* display item price on website even when cart is disabled

* added display settings for item price, availibility and stock levels

* Update shopping_cart_settings.json
2018-06-05 10:43:11 +05:30
Saurabh
62a59301ef [fix] resolved merge conflicts 2018-05-15 13:02:40 +05:30
Manas Solanki
661332dab5 [fix] honour the shopping cart setting when showing the stock and non-stock item (#13988) 2018-05-14 14:30:30 +05:30
Faris Ansari
69b0535e10 [fix] Incorrect currency conversion in Itemised Tax Breakup (#14006) 2018-05-14 14:19:31 +05:30
Britlog
e3a9b9fe49 [Website] Price in items list and sales uom management (#13335)
* Price in items list and sales uom management

* Price in product search page

* Display website stock in sales uom

* Add set_product_info_for_website to avoid duplicate code

* Add price uom in item list and page

* Update product.py
2018-03-20 14:28:44 +05:30
Charles-Henri Decultot
bc7a549fdb Gocardless integration (#13008)
* GoCardless integration

* Addition of a method for determining if the email should be sent or not

* Correction for Tests

* Codacy fix

* Documents moved to ERPNext

* Codacy fix

* Codacy fixes

* Remove method where not necessary and replace with hasattr
2018-03-01 10:59:21 +05:30
Ameya Shenoy
3ee22f0137 rename valid_email to validate_email (#13103) 2018-02-27 12:59:12 +05:30
Faris Ansari
7c744acc49
Changes for Rollup (#12924)
* Changes for rollup

* remove variables.less
2018-02-20 14:21:50 +05:30
Britlog
be9a7231d4 Fix bootstrap layout and move checkout button upper (#12063) 2018-02-12 11:28:57 +05:30
britlog
d13985d1d0 Add number spinner for quantity 2018-01-19 18:31:25 +01:00
Manas Solanki
a521efc990 fix for the non stock items for the shopping cart (#12294) 2018-01-05 12:47:20 +05:30