Request Inventory Match #121
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Requests default to ‘pending’ when created. Volunteers may optionally claim the request or mark it ready for delivery when items have been pulled from inventory. Adds the following methods: - For a given request: `.pending?`, `.claimed?`, `.delivery_ready?` - For all requests: `Request.pending`, `Request.claimed`, `Request.delivery_ready` will give lists of all Requests with the used status
…tumbleshack/CarriesCloset into feature/request-inventory-match
lincolnanders5
added a commit
that referenced
this pull request
Apr 23, 2021
* Added initial documentation * Add Devise & User (#26) * Configured Devise * Added in User * Created default route for unauthorized requests * Spiffed up index page to show current user's actions * Generated `Request` scaffold * Added initial validation and link to form * Changed form copy to show Figma copy * `type` is a reserved field in Rails Migrated from `type` to `relationship` to describe the type of donation. * Added enum-based fields * Added link to home page * Added link to home page * generated user mailer: settings to deliver when request created, drafting email text, and creating test request for email previews * configured settings for sending email from dev, production, and test environments... should be able to see email in terminal now when request is created. * update readme with current action mailer info * update readme updating readme to include some info on current actionmailer status * Add Dockerfile (#28) * First Dockerfile * Fixed dependencies * Dependency build order sped up * rm .env * Update README.md * Add Windows quirks to ReadMe * Add rails webpacker:install to the readme * Gemfile bump Co-authored-by: tumbleshack <[email protected]> * Add Request (#30) * Generated `Request` scaffold * Added initial validation and link to form * Changed form copy to show Figma copy * `type` is a reserved field in Rails * Migrated from `type` to `relationship` to describe the type of donation. * Added enum-based fields * Added link to home page * Added link to home page * fixed hashmapped attribute display issue * Fix .env fetching error * Add Windows quirks to ReadMe * Update README.md * fixed smtp server issues, cleaned up action mailer settings in environments folder, added gmail username and password info to example.env for team members to access * fixed email text and html formatting for more optimal mobile view * update readme with actionmailer info * update readme with actionmailer info * fixed environment variable issue for gmail account settings * fixed pickup location bug in email * update readme with new environment variable info * Categories and DFCS (#39) * populated dropdowns and fixed phone type storage * all validation except conditional address, dfcs link * plugged in a stylesheet (I think) and styling splash page * did some more styling, images links in top bar need work * bit more styling, top bar is button links for now * Update Gemfile and Gemfile.lock (may be 2.5.5 to 2.7.0 .lock issues) * Add Availability Text (#41) * Bump Ruby (#42) * Upgraded from Ruby 2.7.0 to 2.7.2 * Turns out you can throw Rails commands on one line * Might stabalize Windows and Linux environments * Bumped Rails version - Created `rails_user` to control server (previously `root`) - Opened all potential ports - Slimmed down the Docker context copied to container * Updated Dockerfile * Docker now working from clean repo * update readme with error handling info for action mailer * Add Items (String) to Requests (#44) - Add items to Requests as string - Added better seeding of data - Adds automatic creation of up to 10 Requests inside of db/seeds.rb. This file will automatically generate data when run with bin/rails db:seed. * Feature/my requests (#48) * initial route configuration * add "My Requests" button and functionality * add nil checks to dynamically load "My Requests" button * motify title * created new email type for urgent admin emails * added new admin urgent email type to user mailer * created txt and html files to draft new admin email * wrote html and text versions of admin email for ugent requests * fixed urgency bug in html and txt versions of email * added condition to send admin email only if urgent * Add Roles (#57) * Add all role fields * Added convenience scopes and default admin user * Created route protection method * Added convenience link to all requests if admin reviewed by Nooreen * Add Roles (#57) (#58) * Add all role fields * Added convenience scopes and default admin user * Created route protection method * Added convenience link to all requests if admin reviewed by Nooreen Co-authored-by: Lincoln Anders <[email protected]> * changed admin email to multiple recipients plucked from admin role * changed admin email to multiple recipients plucked from admin role * trying to fix no admin emails error * trying to fix admin email nil error * Sign up invite links worked out of the box. Role selection still to be implemented. * Linked view for admins only and restricted path for non-admins * changed default admin email to carries close confirmation email * fixed user role bug by changing trues to 1s * scaffold and initial form for item inventory * admin navigation from home page, some UI stuff * fixed bug, made inventory display categories * fixed bug with nil user on splash page * Added roles to the invite page & customized email * removed unneeded comment * fixed redirect to home to also work when not logged in * made inventory and item pages only accessible to admins * Add faker for db:seed * Items generating as expected * Improve styling * Fix item backing (#78) * scaffold and initial form for item inventory * admin navigation from home page, some UI stuff * fixed bug, made inventory display categories * fixed bug with nil user on splash page * fixed redirect to home to also work when not logged in * made inventory and item pages only accessible to admins * Add faker for db:seed * Items generating as expected * Improve styling Co-authored-by: Lincoln Anders <[email protected]> * Update gems for added branches * Update gems for added branches * made destroy links work (no confirmation) on inventory * delete is working in requests, took out uniqueness constraint that was erroring * fixed destroy link in my_requests * add dropdwons * update items upon submission * added manage users button to admin homepage * created a new controller for users * added a new route for manage users button * created view file for managing users * added user\manage route * created table for user data * added code for populating user data * added all users as parameter to user data page * added dummy buttons for edit and destroy on user table * changed boolean values for roles to yes/no values * making dummy buttons link back to manage users page for now * made an edit page for editing users? * added default rails user edit page to edit button * added a destroy methos to user? * removed detroy and delete buttons since edit includes cancel * added checkboxes for user roles to edit form * added autocomplete for user roles checkboxes * updaes security permissions for device controller to allow user role data for account updates * made show view to see user summary * updated user controller methods to allow certain parameters and added update and edit method * added user edit form for admin to be able to edit other users * updated path that links to edit button on table * allowed for routing to individual user info based on id * removed password option from edit form since admins should not change user passwords * fixed bug that was not letting donor update * fixed bug that was not letting donor update * added last updated timestamp for user changes * added column header for last column * added user role authentication so only admins can manage users * removed user role editing from devise since no longer needed there * added delete button to delete user but without confirmation * Feature/add donor form (#94) * donor form scaffold + link from splash page, including paypal link * Added and formatted links from inventory and splash page to view pending donations; added instructions to add item page * fixed view of all requests to display enum string instead of int * counties enum show string in show page * formatted and put text in donation form, table, and show page to match donee elements * added admin restriction to view all donations, added form data validation * add donations/my_donations route & button * add items dropdown to donate form Co-authored-by: Nicholas Grana <[email protected]> * renamed destroy button * Feature/add donor emails (#95) * fixed wording on donation question * made new files to format donor email * defined new email type for donors * added text for donor emails * send donor email when donation is saved * fixed spelling of gwinett in counties hashmap * added counties hashmap for donations * added preview for donor emails * fixed recipient bug for donor emails * Add Pop-Up View (#99) * Split item selection into own form * Added in popup view * Fix default seed accounts * Requests and Donations now support multiple rows (#101) * add javascript to dynamically load table * Split item selection into own form * Working in donation form; TODO: abstract out of here * Factoring out item selection to a partial * Refactoring object relationships * Refactored item system in database * Making todo more specific * Adding and removing rows with updating dropdowns * Validation appears functional * Editing and showing work * All displays updated * Commenting JS * Adding donations relationship to item_changes * Fixing lock file * Fixing webpack * Cleaning package.json * Authenticate Request#show (#112) * Added time checking to Request#show * Show the top 3 item requests in table (sorted by default by quantity) * User email pref selection working from Edit Acct * Updating setting now works * added new function for volunteer emails * added logic to check if volunteer wants to recieve all emails and fixed bug * added html version of volunteer email * added text version of volunteer email * added code to make volunteer emails send when request created * added code for sending volunteer emails to those who only want urgent but buggy' * volunteer emails working now * fixed typo in volunteer email * fixed typo in volunteer email * modified admin email settings to reflect new email setting options * modified admin email settings to reflect new email setting options * added email settings note to admin emails too * changed sender name to Carrie's Closet of GA * Feature/UI improvements (#117) * working on styling for requests page; input fields and validation * donation form styling * got images in navbar working! * made padding on navbar more like figma * fixed inconsistencies in donee and donor forms styling * fixed navbar of top and got formatting to work Co-authored-by: nooreenfarooqui <[email protected]> * fixed some display issues * fixed checkbox formatting * Request Inventory Match (#121) * Add status to Request Requests default to ‘pending’ when created. Volunteers may optionally claim the request or mark it ready for delivery when items have been pulled from inventory. Adds the following methods: - For a given request: `.pending?`, `.claimed?`, `.delivery_ready?` - For all requests: `Request.pending`, `Request.claimed`, `Request.delivery_ready` will give lists of all Requests with the used status * Added initial volunteer requests view * Extracted shared block to partial * Added seeding of Requests and its item changes * add ability to change status of request for volunteers * add blank checkoxes * Add settled to item_change * Add item settling to interface * add limited stock & out of stock messages, started ability to remove from inventory * add limited/outof stock message to item selection for volunteers * Moved settle view to seperate view Co-authored-by: Nicholas Grana <[email protected]> * fix status error, "settled"->"settle", uses settle amount instead of quantity * index looking better * navbar responds better * add containers to forms * fix responsive issues * Forms looking better * Minor fixes * fix tables * tables are full screen, fixed auth issue * Fixed radio buttons * Fix authentication cascade * Add Multiple Items to Pop Up Form (#135) * Added in multiple items for pop-up shops * Added seeding of items * Feature/prospective volunteer view (#139) * changed volunteer to 'Get Involved', links to CC website to make maintaining info easier * created page for prospective volunteers and social media * fixed sign in bug with empty password confirmation (#138) * Add Quality Sorted Page (#134) * Added seeding of donations * created quality filtering * remind volunteer to contact donee * added contact reminder for volunteers to contact donees * added text Co-authored-by: juliagrigni <[email protected]> Co-authored-by: juliagrigni <[email protected]> * Revert "Merge branch 'feature/fix-css' into develop" This reverts commit 57cea91, reversing changes made to 308dd92. * Really Fix Meet (#143) * Added seeding of donations * created quality filtering * Added in multiple items for pop-up shops * Added seeding of items * changed volunteer to 'Get Involved', links to CC website to make maintaining info easier * created page for prospective volunteers and social media * fixed sign in bug with empty password confirmation * remind volunteer to contact donee * added contact reminder for volunteers to contact donees * added text * Fixed bug in Popup shop * Meet showing properly Co-authored-by: Lincoln Anders <[email protected]> Co-authored-by: Farooqui, Nooreen <[email protected]> Co-authored-by: nooreenfarooqui <[email protected]> Co-authored-by: tumbleshack <[email protected]> Co-authored-by: Nicholas Grana <[email protected]> Co-authored-by: tumbleshack <[email protected]>
tumbleshack
pushed a commit
that referenced
this pull request
Apr 24, 2021
* Add status to Request Requests default to ‘pending’ when created. Volunteers may optionally claim the request or mark it ready for delivery when items have been pulled from inventory. Adds the following methods: - For a given request: `.pending?`, `.claimed?`, `.delivery_ready?` - For all requests: `Request.pending`, `Request.claimed`, `Request.delivery_ready` will give lists of all Requests with the used status * Added initial volunteer requests view * Extracted shared block to partial * Added seeding of Requests and its item changes * add ability to change status of request for volunteers * add blank checkoxes * Add settled to item_change * Add item settling to interface * add limited stock & out of stock messages, started ability to remove from inventory * add limited/outof stock message to item selection for volunteers * Moved settle view to seperate view Co-authored-by: Nicholas Grana <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses issues #108 and #109