FSFE/fsfe-website
25
31
Fork 91
Code Issues 65 Pull Requests 5 Wiki Activity

Ordering Improvements #4258

Merged
delliott merged 3 commits from test into master 2024-07-12 08:24:42 +00:00
Conversation 4 Commits 3 Files Changed 154 +833 -956
delliott commented 2024-06-24 15:25:01 +00:00
Member
Copy Link

This branch continues on the work completed by @rekado in #2750 and aims to incorporate the feedback about the ordering folder layouts raised by @reinhard in that thread.

Additionally it aims to add counts of items to the website, and so hide items at build time if there are too few of them to be sold, as trying to sell them will likely result in us having to refund people as the item is not available.

Current behavior can be seen at https://test.fsfe.org/order/index.en.html.

This branch continues on the work completed by @rekado in #2750 and aims to incorporate the feedback about the ordering folder layouts raised by @reinhard in that thread. Additionally it aims to add counts of items to the website, and so hide items at build time if there are too few of them to be sold, as trying to sell them will likely result in us having to refund people as the item is not available. Current behavior can be seen at https://test.fsfe.org/order/index.en.html.
delliott force-pushed test from 719c65b697 to fc0165725b 2024-06-25 13:20:13 +00:00 Compare
delliott force-pushed test from fc0165725b to f11cf3ff27 2024-06-25 13:22:06 +00:00 Compare
delliott force-pushed test from f11cf3ff27 to cf88fef82e 2024-06-25 15:46:31 +00:00 Compare
delliott force-pushed test from 70321851cb to cd72c1c505 2024-06-26 10:46:42 +00:00 Compare
delliott force-pushed test from 411219a0ba to 0115935c74 2024-06-26 13:03:56 +00:00 Compare
delliott force-pushed test from 0115935c74 to 75020cb1ff 2024-06-26 13:19:57 +00:00 Compare
delliott force-pushed test from 75020cb1ff to e4f1fb13a6 2024-06-26 13:21:08 +00:00 Compare
delliott force-pushed test from e4f1fb13a6 to cd0d1676d2 2024-06-26 13:42:08 +00:00 Compare
delliott force-pushed test from cd0d1676d2 to 9220722b55 2024-06-26 15:48:16 +00:00 Compare
delliott force-pushed test from 9220722b55 to 1ed614f880 2024-06-27 07:30:14 +00:00 Compare
delliott force-pushed test from c4905b8d66 to 4591d0c823 2024-06-27 13:21:12 +00:00 Compare
delliott force-pushed test from 4591d0c823 to 1d5290dede 2024-06-27 13:32:41 +00:00 Compare
delliott force-pushed test from 8e49dcfd1d to b757253307 2024-06-27 14:47:00 +00:00 Compare
delliott force-pushed test from b757253307 to 929b22a7b9 2024-06-27 15:19:01 +00:00 Compare
delliott force-pushed test from 929b22a7b9 to 3c92c50a20 2024-06-28 07:38:29 +00:00 Compare
delliott force-pushed test from 3c92c50a20 to 3837a7cce8 2024-06-28 07:43:23 +00:00 Compare
delliott force-pushed test from ac70bf8bec to 88e54314d7 2024-06-28 08:34:35 +00:00 Compare
delliott force-pushed test from 88e54314d7 to 7a71d73733 2024-06-28 08:40:40 +00:00 Compare
delliott force-pushed test from 7a71d73733 to 58aa88e705 2024-06-28 08:50:33 +00:00 Compare
delliott commented 2024-06-28 08:56:07 +00:00
Author
Member
Copy Link

This pr is currently functional.

It fixes the issue with using post requests from the merch ordering page, and changes the layout of the items directory to no longer be based on year.

Removal of items from store based on available quantity at build time is not implemented.

This pr is currently functional. It fixes the issue with using post requests from the merch ordering page, and changes the layout of the items directory to no longer be based on year. Removal of items from store based on available quantity at build time is not implemented.
delliott commented 2024-06-28 13:06:53 +00:00
Author
Member
Copy Link

NOTE Quantities of items in items.en.xml file not correct, should not be merged as it will make available items that should not be available.

Currently can hide sizes of items that are unavailable, but not a whole item if there are no sizes available.

NOTE Quantities of items in items.en.xml file not correct, should not be merged as it will make available items that should not be available. Currently can hide sizes of items that are unavailable, but not a whole item if there are no sizes available.
delliott force-pushed test from 564428b9c7 to 0106c53001 2024-06-28 13:10:32 +00:00 Compare
delliott force-pushed test from 0106c53001 to 12c4abfe4c 2024-07-08 07:35:49 +00:00 Compare
delliott force-pushed test from 12c4abfe4c to e6e3037ad9 2024-07-08 14:14:26 +00:00 Compare
delliott force-pushed test from e6e3037ad9 to 90bac91ad2 2024-07-09 08:19:42 +00:00 Compare
delliott force-pushed test from 90bac91ad2 to 64f7bae440 2024-07-09 15:06:23 +00:00 Compare
delliott commented 2024-07-10 11:25:55 +00:00
Author
Member
Copy Link

Decisions made that this should hide unavailable sizes, but not whole items so that people see what items can theoretically be bought. Items that are no longer available for extended period, eg christmas cards, plussy pins, should be commented out in items.en.xml

Decisions made that this should hide unavailable sizes, but not whole items so that people see what items can theoretically be bought. Items that are no longer available for extended period, eg christmas cards, plussy pins, should be commented out in items.en.xml
delliott force-pushed test from 64f7bae440 to 225ce057a3 2024-07-11 12:29:17 +00:00 Compare
delliott force-pushed test from 225ce057a3 to fcd0b88041 2024-07-11 13:52:32 +00:00 Compare
delliott commented 2024-07-11 13:53:19 +00:00
Author
Member
Copy Link

Following feedback from @reinhard it has been decided to remove the automatic item hiding feature.

Following feedback from @reinhard it has been decided to remove the automatic item hiding feature.
delliott changed title from WIP: Ordering Improvements to Ordering Improvements 2024-07-11 14:13:31 +00:00
delliott force-pushed test from fcd0b88041 to d1c0a0f1c8 2024-07-12 08:22:57 +00:00 Compare
delliott merged commit a33c5e7b44 into master 2024-07-12 08:24:42 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
build

   
cgi Scripting

   
design

   
disruptive

Requires careful coordination and documentation changes

  
documentation

   
duplicate

   
easy

   
feature-request

   
help wanted

   
javascript

   
priority/low

   
question

   
system-hackers

   
tagging

   
text

   
translations

   
wait/bugfix

   
wait/inprogress

   
wait/misc

   
wait/proofread

   
wontfix

   
xsl
No Label
bug
build
cgi Scripting
design
disruptive
documentation
duplicate
easy
feature-request
help wanted
javascript
priority/low
question
system-hackers
tagging
text
translations
wait/bugfix
wait/inprogress
wait/misc
wait/proofread
wontfix
xsl
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: FSFE/fsfe-website#4258
No description provided.
Delete Branch "test"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?