raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,144 Commits 20 Branches 451 Tags
d0acd47935facb4bc9dfd5dc09cdc860f0a43b68
Commit Graph

3016 Commits

Author SHA1 Message Date
Sebastian Castro
0218f75f34 Packing Report: hide by default phone and price column to avoid breaking changes 2022-05-12 16:54:14 +02:00
Sebastian Castro
767afe1fba Reports Renderer: whitelist report formats 2022-05-12 16:54:14 +02:00
Sebastian Castro
287e8f5845 Reports Refactor 3 
Easily group and create header and summary row
Auto format cells when appropriate type (boolean, dates) and render_format (neither csv nor json)
 2022-05-12 16:54:13 +02:00
Sebastian Castro
452a3fa933 Reports Refactor 2: Merge Spree::reports into Admin::Reports 2022-05-12 16:54:13 +02:00
Sebastian Castro
288a35f062 Reports Refactor 2: New templates abstract classes 2022-05-12 16:54:13 +02:00
Sebastian Castro
5f78fdce8b Reports Refactor 2: Move all code to lib/reporting 2022-05-12 16:54:13 +02:00
Sebastian Castro
392166b57a Reports Refactor 2: Simplify render_content? method 2022-05-12 16:54:13 +02:00
Sebastian Castro
2985d2af15 Report Refactor 1 Cleaning 
clean no longer used methods
Remove no longer needed require
Delete files not used
Fix Linting
 2022-05-12 16:54:13 +02:00
Sebastian Castro
e9513f6172 Report Refactor 1: Enterprise Fee Summary 
Disable enterprise fee summary spec for now

Will need to write them again
 2022-05-12 16:54:13 +02:00
Sebastian Castro
4a99a7d1de Report Refactor 1: Xero Invoices 2022-05-12 16:54:13 +02:00
Sebastian Castro
41c11baa3f Report Refactor 1: Users & Entreprises 2022-05-12 16:54:13 +02:00
Sebastian Castro
3d1b61ae6e Report Refactor 1: Products & Inventory 2022-05-12 16:54:13 +02:00
Sebastian Castro
881a708ecf Report Refactor 1: Payments 2022-05-12 16:54:13 +02:00
Sebastian Castro
9d943625a3 Report Refactor 1: Sales Tax 2022-05-12 16:54:13 +02:00
Sebastian Castro
e20c2e3ced Report Refactor 1: Orders & Distributors 2022-05-12 16:54:13 +02:00
Sebastian Castro
01be6fb1f3 Report Refactor 1: Order Cycle Management 2022-05-12 16:54:13 +02:00
Sebastian Castro
1fee45035c Report Refactor 1: Customers 2022-05-12 16:54:12 +02:00
Sebastian Castro
09247b21cd Reports Refactor 1 
Use code closer to the new packing report controller
Handle nil @report_subtypes
 2022-05-12 16:54:12 +02:00
Sebastian Castro
213c0dd060 Packing Report: add price and reorder columns 
Adds price column
last_name column first because it's used for ordering
 2022-05-12 16:54:12 +02:00
Sebastian Castro
d53d38906a Packing Report: Refactor view to be reusable by other reports 
For now this view is used only in the context of packing, but later we would move all existing rpeort to use same view
 2022-05-12 16:54:12 +02:00
Jean-Baptiste Bellet
61f8dfd809 Add order_token params to the redirect URL after checkout 2022-05-09 17:45:52 +02:00
Maikel
e59d753333 Merge pull request #9044 from georgethoppil/optional-restock-items 
Optional restock items
 2022-05-09 09:08:26 +10:00
GeorgeThoppil
8903496a1b Optional restocking items 2022-05-06 10:55:24 -04:00
Filipe
fb834d3143 Merge pull request #9138 from jibees/9137-order-shipping-methods-alphabetically 
Split checkout: Order shipping methods by name
 2022-05-05 12:41:12 +01:00
Jean-Baptiste Bellet
34fcb4a1f7 Order shipping methods by name 
+ create spec
 2022-04-27 16:37:37 +02:00
Jean-Baptiste Bellet
8bbb80ef55 Catch GatewayError exception and handle by updating flash[:error] 2022-04-27 15:43:05 +02:00
Maikel Linke
ba1e21ad75 Feature-toggle API also per API key 
We looked only at logged in users (session cookie) before.
 2022-04-15 12:34:57 +10:00
Maikel
26d6969b5b Merge pull request #9045 from jibees/9043-send-email-cancelation-by-default 
Send cancellation email by default when cancelling an order
 2022-04-13 11:53:43 +10:00
Filipe
afcdfce37d Merge pull request #8967 from mkllnk/api-customers-final 
Serve customers data via first API v1 endpoint in JSON:API format behind feature toggle
 2022-04-07 21:03:06 +01:00
Filipe
f29dc3f978 Merge pull request #9009 from jibees/9007-already-opened-cart 
SplitCheckout: add already opened cart message on summary step when distributor allow order changes
 2022-04-01 13:29:34 +01:00
Filipe
e2b1c0d93f Merge pull request #9004 from jibees/8999-filter-shipping-methods-with-tag 
SplitCheckout: filter shipping method with tag
 2022-03-31 12:09:06 +01:00
Jean-Baptiste Bellet
6a48bdbb82 Send email cancelation by default 2022-03-29 10:12:00 +02:00
Filipe
be1c255067 Merge pull request #8892 from Matt-Yorkley/spree-login-routes 
Fix issue with unconfirmed email messages
 2022-03-28 13:38:17 +01:00
Maikel Linke
742ae761a3 Move helper statement to controller 
It's not available in concerns.
 2022-03-28 11:34:37 +11:00
Maikel Linke
5063f377c3 Enable relationship inclusion for customers#show 
This will allow us to include address records.
 2022-03-28 11:04:30 +11:00
Maikel Linke
d789fb32e9 Make customer's address writable on API 2022-03-28 11:04:30 +11:00
Maikel Linke
51420934f3 Add billing and shipping address to customer 2022-03-28 10:58:18 +11:00
Maikel Linke
adc7e97e62 Add tag list to customer endpoint 2022-03-28 10:55:58 +11:00
Maikel Linke
aa6e5ae799 Report useful error message in missing parameter 2022-03-28 10:55:57 +11:00
Maikel Linke
8d12c7a692 Permit more customer attributes for update 2022-03-28 10:55:57 +11:00
Maikel Linke
41746459fa Restrict allow_charges attribute to read-only 
We want people to use the UI to change this attribute.
 2022-03-28 10:55:57 +11:00
Matt-Yorkley
ad5c834342 Merge pull request #8995 from apricot12/7853-deprecation-warnings-1 
7853 deprecation warnings 1
 2022-03-25 19:54:06 +00:00
jibees
9a5318965c Use as an helper 
Co-Authored-By: Maikel <maikel@email.org.au>
 2022-03-24 09:11:58 +01:00
Maikel
877002afd8 Merge pull request #8891 from mkllnk/api-customers 
Create API v1 with customers endpoint
 2022-03-22 19:37:23 +11:00
Jean-Baptiste Bellet
13a45557a4 Load cart already opened boolean 
thanks to EnterprisesHelper
 2022-03-17 16:47:16 +01:00
Filipe
0dd398abba Merge pull request #8926 from mkllnk/8925-invalid-param 
Gracefully handle admin UI failure on updating enterprise notifications
 2022-03-17 14:19:34 +00:00
Jean-Baptiste Bellet
0948ce47ed Use EnterprisesHelper to retrieve shipping methods 
that apply tag filtering on shipping methods
 2022-03-16 11:10:46 +01:00
Nihal Mohammed
b3771bb623 Use bypass_sign_in method instead of bypass option in app/controllers/spree/users_controller.rb 2022-03-15 05:35:43 +05:30
jibees
d4a4a36b14 Merge pull request #8766 from jibees/8477-cancel-order-and-send-confirmation-email-on-last-item-deletion 
Edit order: on last item deletion, cancel the order and conditionally send cancellation email to consumer
 2022-03-11 08:56:41 +01:00
Filipe
3cf2db68b1 Merge pull request #8945 from jibees/8914-do-not-display-shipping-method-backoffice-only-for-split-checkout 
SplitCheckout: display only shipping method that are set as front end available
 2022-03-10 16:13:42 +00:00