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

705 Commits

Author SHA1 Message Date
Hussain Nagaria
41a5ebc6c0 feat: Add fallback when redisearch not loaded 2021-11-16 16:40:45 +05:30
marination
53bb7a9cd1 chore: Shopping Cart styles and cleanup shallow 
- Added remove button to cart item rows
- Freeze on change in Shopping Cart (UX)
- Fixed cart items and taxes/totals alignment issues
- Made Cart responsive
- Added free item indicator
- Fixed item group nested routing issue
- Sales Order is populated with right source warehouse
 2021-11-16 16:39:58 +05:30
marination
b29c5d6e84 fix: Discount Filters and Web templates 
- Fixed discount filters (didn’t work after js render change)
- Fix Item Card Group template height and style
- Add placeholder to missing images in Product Category Cards template
- Code cleanup
 2021-11-16 16:37:08 +05:30
marination
423d7516b4 fix: Empty states and miscellanous fixes 
- Added Wishlist and Product Listing empty states
- Hide ‘Write Review’ button f user is not Customer
- Fixed grid view title (missing arg)
- Render empty state if no items form server side
- Removed unused function
- Guest user redirected to login on clicking Wishlist button
- Fixed ‘Notes’ field clearing issue
 2021-11-16 16:35:43 +05:30
marination
897c08c8e7 feat: Product View toggling 
- Added fully functional list and grid view toggling
- Added ProductGrid and ProductList controllers
- Moved html snippets, rendered via JS now
- Item Group page also rendered via common controller
- Paging section rendered via JS
- Minor style changes
 2021-11-16 16:14:59 +05:30
marination
48b3ce82b9 feat: (wip) Toggle Views 
- Auto Height on Cards
- Title with ellipses on length exceed
- Changed namepaces
- Moved product card rendering to JS
- Added Image and List View Toggling buttons
- Kept basic filters rendering just as before
 2021-11-16 16:11:09 +05:30
marination
f9929ed8a6 Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop 2021-11-16 16:06:07 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Faris Ansari
8b547e39a8 feat: Taxes template for selling/buying doctypes 
Depends on the new Print Format Builder
frappe/frappe#14134
 2021-10-21 12:06:02 +05:30
marination
8f0b9c9406 fix: Show Offers section only if offers exist 2021-10-12 18:16:17 +05:30
marination
0a703740bb feat: Offer Display 
- Added offers section in website item
- Added more roles to website item
- Fixed attachment limit issue in website item
- Created Website Offer child doctype
- Added offers listing in Item full page view
- style fixes
 2021-10-12 18:16:03 +05:30
Hussain Nagaria
c69de2d7a8 chores: Add function params and remove unused imports 2021-10-12 18:15:07 +05:30
Hussain Nagaria
4309239d6c feat: Show Recent Searches 2021-10-12 18:14:43 +05:30
Hussain Nagaria
70b164e7dd chore: Add query clean-up 2021-10-12 18:13:51 +05:30
Hussain Nagaria
ffc8616c63 refactor: Use global redis connection 2021-10-12 18:13:37 +05:30
Hussain Nagaria
ba25460edf chore: Make it a little beautiful 2021-10-12 18:13:27 +05:30
Hussain Nagaria
f3421554ad feat: Add Category autocomplete with config in settings 2021-10-12 18:02:24 +05:30
Hussain Nagaria
8e55c95ecc feat: Make search index fields configurable 
- Move indexing logic to separate file
- Add more validation logic for 'search index fields' field
 2021-10-12 18:02:09 +05:30
Hussain Nagaria
e82833f14a feat: Basic Query + Autocomplete 2021-10-12 17:57:46 +05:30
Hussain Nagaria
0c47f3a876 feat: Add basic autocomplete using redisearch 2021-10-12 17:57:19 +05:30
marination
71f4b98d0c chore: Sider and Semgrep 2021-10-12 17:52:54 +05:30
marination
1d94914102 feat: Discount Filters 
- Discount filters in filters section
- Code cleanup
 2021-10-12 17:46:03 +05:30
marination
60261852b2 feat: Slashed Prices and Discount display 
- Registered mrp and price after discounts
- slashed price with discount in listing, item page and wishlist
- removed redundant imports
- renamed method to `get_web_item_qty_in_stock` to get Website Item stock
- adjusted styles for resizing
- made add to cart button full width on cards
 2021-10-12 17:38:36 +05:30
marination
3d5f029e51 fix: Sider and Tests 2021-10-12 17:33:22 +05:30
marination
c842305be0 feat: Customer Ratings & Reviews Full Page 
- Created macros for repetitive snippets
- Created Customer Reviews full page
- View more button to reveal 10 more reviews at a time
- Common function to get reviews with start and end
 2021-10-12 17:30:03 +05:30
marination
b15ff57a66 feat: (wip) Ratings and Reviews 
- Added Ratings and Reviews section in Item full page view
- Added provision to write a review with popup
- Created Item Review Doctype to store User-Item unique reviews
- Added privision to enable/disable wishlist and reviews in e commerce settings
- Hide cart and wishlist actions everywhere (even navbar) depending on settings
- Moved some more inline css to scss
- Small logic fixes
TODO: Reviews full page view with paging
 2021-10-12 17:27:32 +05:30
marination
07d7cf01b4 fix: Remove unnecessary css variable and hover state 
- Removed wish-red variable
- Removed hover state from remove wishlist item button in card
- Removed inline css from wishlist item card
 2021-10-12 17:26:10 +05:30
marination
25ffafae81 feat: Product Details Tabbed Section and Add to Wishlist in Item Full Page 
- Add to Wishlist button next to add to cart
- Beautified Product Specifications table section
- Product Specifications can be optionally in a tabbed section with custom tabs added
- Removed hard coded gray bg to allow custom theme overwrites
- Fixed resizing issues in Item Full Page view
- Cleaned up inline styles and ported to scss
 2021-10-12 17:25:51 +05:30
marination
cd117149e1 fix: Sider 2021-10-12 17:24:15 +05:30
marination
59514408b9 feat: Wishlist Page 
- Navbar icon with badge count for wishlist
- Wishlist page with cards
- Cards can be moved to cart or removed in a click
- Separated all wishlist related methods into wishlist.js
- Made a common js method(util) to add/remove wishlist items
- Bug fix: Make sure items are removed from session user's wishlist
 2021-10-12 17:23:55 +05:30
marination
96cc5068b2 feat: Wishlist from card actions 
- Add remove items from wishlist
- Wishlist icon at nav bar
- Animate wishlist icon in card and navbar
- Remember wished state after refresh as well
 2021-10-12 17:23:12 +05:30
marination
4f64d1c7f2 feat: Animate Add to Cart List interactions (UX) 
- Increased qty in cart on clicking add to cart for existing item
- Simplified macro arguments
- Navbar cart icon animation
- Explore button for template item in card
- Add to cart button animation
 2021-10-12 17:18:51 +05:30
marination
16b9c8c383 feat: Card Actions and Wishlist 
- Rough UI for card actions
- Wishlist doctype
- Indicators on card based on stock availability
 2021-10-12 17:18:06 +05:30
marination
d7130e31fe feat: Shop by Category 
- Added Shop by Category Page
- Tabbed sections for item fields in Shop by Category Page
- Added Shop by Category Section in E commerce Settings
- Nested Navigation & Breadcrumbs in Item group pages
- Added scrollable & clickable Sub categories in Item Group page
- Made breadcrumbs slightly dynamic in Item Page
- Added image to Brand doctype
 2021-10-12 17:00:30 +05:30
marination
22f41a17b7 chore: Removed Shopping Cart Module 
- Moved all files and web templates from Shopping Cart to E-commerce module
- Made Shopping Cart module obsolete
- Moved select E-commerce related files from Portal to E-commerce module
- Minor cleanups
- Fixed Shopping Cart and Product Configurator tests
 2021-10-12 16:54:11 +05:30
marination
37a246e738 chore: Patches for Website Item 
- Patch to make website item from item
- Patch to move Products and Shopping Cart Settings into E Commerce Settings
- Patch to move products in Homepage from Item to Website Item
- Minor cleanup, replacing/removing references to Item website fields (obsolete)
 2021-10-12 16:16:17 +05:30
marination
eef9cf152f chore: Drive E-commerce via Website Item 
- Removed Shopping Cart Settings
- Portal fully driven via E Commerce Settings
- All Item listing querying will happen via ProductQuery engine only
- Product Listing via Website Items
- removed redundant code
- Moved all website logic from Item to Website Item
 2021-10-12 15:48:06 +05:30
Saqib
f2fca59ba7
fix: cannot set custom label for 'total' field in print format (#27664) 2021-09-27 14:28:16 +05:30
escix
dafe99b6e2
fix: holiday message reminder 
Minor grammatical change
 2021-09-26 11:09:13 +05:30
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Dany Robert
c7bad657b1
fix: broken URL in supplier portal (#26823) 
* fix: broken URL

The quotations are supplier quotations, not sales quotation.

* fix: remove erpnext from path
 2021-08-24 22:10:14 +05:30
Frappe PR Bot
255b99ebdc
feat: Employee reminders (#25735) (#27115) 
* feat: Add reminders section to HR Settings

* refactor: Extract generic function for getting Employees

* feat: Employee Work Anniversary Reminder

* feat: Daily Holiday Reminder

* fix: Unnecessary params and replace [] with .get()

* test: Daily Holiday Reminders

* test: is_holiday basic tests

* refactor: Move employee reminders code to separate module

* feat: Add advance reminder to HR settings

* feat: Advance Holiday Reminders

* refactor: get_holidays_for_employee

* feat: Email holiday reminders in advance + tests

* fix: Remove unused import

* refactor: HR Setting Reminder Section

* refactor: Remove Daily Holiday Reminders feat

* feat: Reminder miss warning

* fix: Failing test and function name change

* chore: Add patch for field rename

* chore: Rename frequency label

* fix: Failing patch test

* fix: sider and removed description of fields

* fix: email alignment

Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac)

Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-08-24 20:19:22 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +05:30
marination
f40da4ac4c fix: Paging buttons not working on item group portal page 2021-07-14 20:48:06 +05:30
Marica
dbf835ced3
Merge branch 'develop' into paging-btns 2021-07-14 20:15:22 +05:30
marination
4c6e952902 fix: Paging buttons not working on item group portal page 2021-07-14 20:01:36 +05:30
18alantom
9ea5072c52 fix: set item group as a persistent filter 2021-07-14 17:41:38 +05:30
18alantom
ddbf7c0020 fix: set item group as a persistent filter 2021-07-14 15:43:22 +05:30
Jannat Patel
5173e74a04
fix: Project Portal Enhancements (#26290) 
* fix: project portal enhancements

* fix: condition for pills
 2021-07-02 11:48:46 +05:30
Jannat Patel
5a4251107c
feat: Project Portal Enhancements (#26090) 
* fix: project portal enhancements

* fix: timesheet table and task nesting

* fix: semgrep and link issue

* fix: sider

* fix: project details view title

* fix: project progress pills

* fix: website route rule for project

* fix: multi level nesting

* fix: added subject and indentation

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-01 17:17:34 +05:30
Nabin Hait
5b462ad11a fix: merge conflict 2021-06-24 15:36:51 +05:30
marination
26bec9d7b4 fix: Country Link field in 'Add address' website modal auto-clears 2021-06-24 13:50:18 +05:30
marination
f5fa1ee4b6 fix: Country Link field in 'Add address' website modal auto-clears 2021-06-24 11:03:32 +05:30
Rohit Waghchaure
9e616b09a2 fix: material request and supplier quotation not linked if sq created from supplier portal against rfq 2021-06-20 15:17:20 +05:30
Rohit Waghchaure
8c844e4515 fix: material request and supplier quotation not linked if sq created from supplier portal against rfq 2021-06-19 16:08:26 +05:30
Suraj Shetty
d3b9edd2c4 fix: Remove unnecessary import 2021-05-25 12:52:26 +05:30
Faris Ansari
69eb6d476e Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 15:21:33 +05:30
Faris Ansari
464d838447 fix: Update bundle paths 2021-05-07 14:53:42 +05:30
Faris Ansari
1fe891b287 refactor: Replace Class.extend with native class 2021-04-23 08:04:00 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
prssanna
56ab3fb132 fix: issue web list style 2021-03-31 18:26:37 +05:30
prssanna
f1dbc021fc fix: issue web list style 2021-03-16 14:15:59 +05:30
Nabin Hait
fe3529b194 fix: merge conflict 2021-03-11 16:45:41 +05:30
Anupam
d7f4aefd00 feat: added continue-shopping button on cart 2021-02-05 16:17:20 +05:30
prssanna
526ea46ae2 fix: formatting issues 2021-02-01 20:12:47 +05:30
prssanna
11eae6d51a fix: add default product-image css class 2021-02-01 20:01:37 +05:30
prssanna
a3585e40f7 style: fix formatting 2021-02-01 19:50:27 +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
Nabin Hait
a6213ccd61 Merge branch 'develop' into version-13-beta-pre-release 2021-01-28 17:36:08 +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
Anupam
e6f925e5e6 review changes 2021-01-28 15:58:03 +05:30
Mohamed Almubarak
f7ea340181
fix(template): cards on second row overlaps the one before (#23454) 
* Update macros.html

fix second row of cards overlapps with the one before

* Update macros.html

fix(template): second row of cards overlaps with the one before

* Update macros.html

fix(template): second row of cards overlaps with the one before
 2021-01-28 12:32:13 +05:30
prssanna
74feaf85dc fix: website order page style 2021-01-27 17:41:15 +05:30
Suraj Shetty
0c34a711eb Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release 2021-01-25 16:06:38 +05:30
Anupam
8541d9738f fix: review changes 2021-01-25 14:18:26 +05:30
prssanna
2aa1efb70e fix: broken image style 2021-01-22 15:31:38 +05:30
Anupam
988ea8d61d feat: shopping portal changes 2021-01-22 10:53:50 +05:30
Suraj Shetty
8670dda5b7 fix: Use abbr method for abbr 2021-01-21 16:47:04 +05:30
Suraj Shetty
2dcdeb8231 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 15:33:42 +05:30
Suraj Shetty
17ed3fc270 fix: Set css_style fallback 2021-01-21 15:33:36 +05:30
prssanna
f3d321fb82 fix: remove console.log 2021-01-21 15:31:42 +05:30
prssanna
9f1a156307 Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 13:04:58 +05:30
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