Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,336 Commits 3 Branches 0 Tags 1 GiB
570ae422a8
Commit Graph

620 Commits

Author SHA1 Message Date
prssanna
b00eb1b0cc feat: shopping cart page 2021-01-20 17:52:54 +05:30
prssanna
706eae7cac fix: product page fixes 2021-01-20 17:47:25 +05:30
Suraj Shetty
2e67a41c27 fix: Update birthday avatar code 2021-01-20 10:12:01 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
Suraj Shetty
3d00e25232 refactor: Employee birthday reminder 2021-01-15 14:48:28 +05:30
Kanchan Chauhan
d2c71350cd
refactor(Job Application): New fields in Job Applicant and webform (#23326) 
* refactor(Job Application): New fields in Job Applicant and webform

* fix: translation syntax

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-01-15 13:56:03 +05:30
Shivam Mishra
45a56288bb feat: style adjustments to product page 2020-12-30 15:51:50 +05:30
Shivam Mishra
31a651365d feat: update item group website slider 2020-12-30 15:51:34 +05:30
Shivam Mishra
7055969ef3 feat: update item group template 2020-12-29 17:18:41 +05:30
Shivam Mishra
bba2726333 fix: minor styling fixes 2020-12-24 14:14:17 +05:30
prssanna
eb0e596d43 feat: store home page and product page 2020-12-24 11:40:33 +05:30
Deepesh Garg
5a06908bbc fix: Add breadccrumbs to item group page 2020-12-17 17:38:53 +05:30
Rushabh Mehta
34fc528500 fix(minor): debounce taxes call 2020-12-16 09:44:11 +05:30
Nabin Hait
3423d94145 fix: Fixed merge conflict 2020-12-12 21:12:56 +05:30
Suraj Shetty
dc13d4b0fc Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-11 12:57:04 +05:30
Saqib Ansari
19d5074c25 fix: get formatted value in 'taxes' print template 2020-11-30 15:49:00 +05:30
prssanna
922432616f Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2020-11-10 17:24:15 +05:30
prssanna
e3b71b9b24 fix: compact item print style 2020-11-10 17:23:24 +05:30
Anupam
14ef229b12 Revert "Update item_add_to_cart.html" 
This reverts commit 5b3af82e75.
 2020-11-06 16:50:15 +05:30
Anupam
886b680e1b revert changes 2020-11-06 16:48:39 +05:30
Anupam Kumar
ca9b58589b
fix: replaced formatdate -> format_date (#23847) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-11-06 14:56:27 +05:30
Suraj Shetty
c2d97e9d9c Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-11-06 10:26:19 +05:30
Anupam Kumar
3a9dc90695
fix: fix: replaced formatdate -> format_date (#23829) 2020-11-05 18:51:56 +05:30
prssanna
71e5b60df1 refactor: refactor contextual print setting implementation 2020-10-29 14:19:34 +05:30
Faris Ansari
bc6a2b2f9c wip 2020-10-28 13:54:11 +05:30
prssanna
13c6e2f320 feat: contextual setting for print uom after quantity 2020-10-22 17:19:00 +05:30
Shivam Mishra
9d468a8daf Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-21 11:38:31 +05:30
Shivam Mishra
55f52e8135 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-13 20:09:22 +05:30
Marica
9cc05bb83e
Merge branch 'develop' into rfq-email 2020-10-12 18:02:15 +05:30
marination
629fa57f9d fix: Remove unneccessary div 2020-09-28 21:17:49 +05:30
marination
056c86033d fix: Reuse function to render email preview 
- Reused `supplier_rfq_mail` to render preview
- Print hid Salutation and Subject
- Completely dynamic greeting
 2020-09-28 17:42:22 +05:30
marination
bd36f2b94d feat: Supplier Email Preview in RFQ 2020-09-28 15:59:03 +05:30
Anupam Kumar
5b3af82e75
Update item_add_to_cart.html 2020-09-28 10:59:43 +05:30
Shivam Mishra
9a4d603403 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-09-25 11:44:37 +05:30
Anupam
a4df105813 fix: UI fixes 2020-09-24 13:21:54 +05:30
Anupam
09775bbdaa feat: showing UOM even item price is hidden 2020-09-24 11:19:32 +05:30
Anupam
c077fac2a6 feat: provision to draft quotation from portal 2020-09-23 22:02:31 +05:30
Frappe ERPnext
9355641c49 refactor: logic moved to standard template 
Previously print_settings.py controller decided which template to use.
Now standard template decides what to print according to settings.
 2020-09-03 17:31:21 +02:00
Frappe ERPnext
a5d5e70bf4 Revert "feat: Option to print UOM after quantity" 
This reverts commit a787882a8f.
 2020-09-03 17:30:25 +02:00
Frappe ERPnext
be3b8a1c96 Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty 2020-09-02 21:31:31 +02:00
Anupam K
f9f26d2fa4 fix: contact us button issue 2020-08-31 14:34:42 +05:30
Frappe ERPnext
a787882a8f feat: Option to print UOM after quantity 
Standard for ERPNext prints was UOM before quantity. Now user has a choice.
 2020-08-28 13:28:52 +02:00
Suraj Shetty
b6ebcd7559 refactor: Replace darkgray indicator with gray indicator 2020-08-27 18:57:18 +05:30
prssanna
744169833c fix: replace indicator color darkgrey with darkgray 2020-08-27 17:06:10 +05:30
Anupam K
c7830f7107 feat: Added phone field in product Inquiry 2020-08-26 15:28:22 +05:30
Shivam Mishra
2fe5d76fe4
Merge branch 'develop' into item-image-alt 2020-08-11 14:45:55 +00:00
Shivam Mishra
3325be1d87
fix: spacing for slideshow (#22996) 2020-08-11 16:03:46 +05:30
Shivam Mishra
b1f8859121 feat: add alt value in product page 2020-08-07 14:38:40 +05:30
Shivam Mishra
a0954e66a8 feat: add image alt argument for product_image macros 2020-08-07 14:34:54 +05:30
marination
63513f1b14 fix: Show Add to Cart Button anyway 
- add to cart wasnt visible if show price is disabled in shopping cart settings (product_info = null), creating confusion
 2020-08-06 18:22:28 +05:30
marination
ccf44a1bfd fix: product action instead of info 2020-08-06 17:34:38 +05:30
Shivam Mishra
01f664a88f fix: handle product_info null 2020-08-06 17:24:02 +05:30
Anupam Kumar
7137b0b670
refactor: shopping cart (#22617) 
* refactoring shopping cart settings

* adding column_break in shopping cart settings
 2020-07-23 15:58:47 +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
c6592c880a
fix: Student Admission (#22255) 
* Student Admission fix

* adding check for application

* adding check for application

* updating error message

* added date_diff for date comparision
 2020-06-17 12:38:31 +05:30
Anupam Kumar
0a3c34de01
address label chages (#22137) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-17 10:53:13 +05:30
Marica
2112834743
fix: Handle unavailable Variants in Website (#22195) 
* fix: Handle unavailable Variants in Website

* fix: Fetch cart setting from argument
 2020-06-16 00:20:57 +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
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +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
Pranav Nachnekar
af18b2cdc5
Merge branch 'develop' into scheduling-ui-rewrite 2019-11-04 04:38:59 +00:00
0Pranav
53ec8c6322 Merge branch 'develop' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite 2019-11-01 12:40:08 +05:30
0Pranav
97f6576213 prettify confirmation email 2019-11-01 12:36:06 +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
sahil28297
b1604a24ed fix(add_to_cart): show add_to_card button only if specific conditions are satisfied (#19007) 2019-09-12 11:20:55 +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
Suraj Shetty
83705af0b3 fix: Filters for portal quotation list (#18689) 
* fix: Filters for portal quotation list

* fix: Remove unwanted import
 2019-08-12 11:51:27 +05:30
Deepesh Garg
1fb21cd9e5
Merge branch 'version-12-hotfix' into fix-item-template-description 2019-08-10 17:36:00 +05:30
Deepesh Garg
04b42600b0 fix: Changes in print format due to attribute name changes in frappe (#18641) 2019-08-08 15:51:50 +05:30
Faris Ansari
2260838933 fix(Item Template): Fallback description string 
Fixes #18572
 2019-08-07 17:21:22 +05:30
Faris Ansari
82770d9152 fix: Project fixes (#18343) 
* fix: Add fetch from in Full Name

* fix: Remove deprecated buttons

* fix: Show Project to Administrator
 2019-07-16 09:40:09 +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
Suraj Shetty
93fc6004ad
Merge pull request #17942 from netchampfaris/product-page-cart-disabled 
fix: Show product page even if cart is not enabled
 2019-06-17 12:36:09 +05:30
Suraj Shetty
f821b18a82
Merge pull request #17951 from netchampfaris/product-page-specification 
fix: Remove Specifications label
 2019-06-17 12:32:58 +05:30
Faris Ansari
22642a5f45
fix: Homepage products styling (#17912) 2019-06-14 18:15:40 +05:30
Faris Ansari
f472a49cf6 fix: Remove Specifications label 2019-06-14 16:32:21 +05:30
Faris Ansari
00578ba632 fix: Show product page even if cart is not enabled 2019-06-13 13:30:39 +05:30
John Clarke
8cb92e066d
Update demo.html 
fix typo nit in page
 2019-06-05 10:49:47 -06:00
Faris Ansari
b8eaa3d377 fix: Issue list portal styling 2019-06-01 20:56:37 +05:30
Rushabh Mehta
2df16b1f9b fix(style): demo home page 2019-05-04 11:09:19 +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
scmmishra
a55d32236a fix: fixed trial details 2019-04-19 12:22:30 +05:30
Himanshu
20c17b8229 fix(Update GSTIN): remove '.__' from template (#17062) 
'.__' Avoid Server Side Template Injection
 2019-03-30 12:11:01 +05:30
Faris Ansari
d77fe38513 fix: Remove no_sitemap property 2019-03-20 14:11:05 +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
Rushabh Mehta
b94c8b1c77 fix(tests): add test for bulk complete / cancellation of project 2019-02-26 14:30:38 +05:30