raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,930 Commits 21 Branches 450 Tags
aa6a4925ac7b63d98b2afbc155c10d8a00a78fec
Commit Graph

12773 Commits

Author SHA1 Message Date
Matt-Yorkley
aa6a4925ac Update default images paths for logos 2021-12-27 17:45:06 +00:00
Matt-Yorkley
16c6155b14 Use old image tag in Angular template files 
Angular templates apparently don't work with Webpacker... :/
 2021-12-27 17:45:06 +00:00
Matt-Yorkley
9e6082f0cf Use old image tag for non-compiled images 2021-12-27 17:45:06 +00:00
Matt-Yorkley
f2fc100b5f Replace #image_path helper calls with #image_pack_path 2021-12-27 17:45:06 +00:00
Matt-Yorkley
2888d75cd3 Replace #image_tag helper calls with #image_pack_tag 2021-12-27 17:45:06 +00:00
Matt-Yorkley
12f51febd3 Enable Webpack compiling for all images 2021-12-27 17:45:06 +00:00
Matt-Yorkley
31276ff3f5 Remove images and fonts from app/assets 2021-12-27 17:45:06 +00:00
Matt-Yorkley
a11aebb2ca Update stylesheets loaded with wicked-pdf to use Webpack 
Luckily wicked-pdf already has a corresponding helper method.
 2021-12-27 17:45:06 +00:00
Matt-Yorkley
90956c9d10 Switch mail CSS to Webpacker 2021-12-27 17:45:06 +00:00
Matt-Yorkley
250f0c0a65 Bring in missing select2 image 
This missing image was previously ignored, but now causes a compile error when not found.
 2021-12-27 17:45:06 +00:00
Matt-Yorkley
0e4d77a1bc Move current select2-rails gem stylesheet to /vendor 
This version isn't available via npm and we can't load it from the gem any more as we move to Webpack assets.

As a side note: I think we'll need to replace Select2 soon anyway, so we can delete this once we've done that.
 2021-12-27 17:45:06 +00:00
Matt-Yorkley
80be57a777 Install select2 via yarn and import CSS from node_modules 2021-12-27 17:45:06 +00:00
Matt-Yorkley
74bed15f7f Fix crazy issue with @extend on icons 
This one line of code was crashing asset compilation... :/
 2021-12-27 17:45:06 +00:00
Matt-Yorkley
a38d495bef Update admin css image paths 2021-12-27 17:45:06 +00:00
Matt-Yorkley
2ac3cda2f4 Deal with deprecated @extend syntax 
Errors:
```
SassError: SassError: compound selectors may no longer be extended.
Consider `@extend a, :hover` instead.
See http://bit.ly/ExtendCompound for details.
```
 2021-12-27 17:45:06 +00:00
Matt-Yorkley
2992439706 Include shared variables 2021-12-27 17:45:06 +00:00
Matt-Yorkley
df9f9c1c3b Replace glob imports 
Apparently glob imports aren't a thing in modern sass... *shrugs*
 2021-12-27 17:45:06 +00:00
Matt-Yorkley
5bc02d1e74 Fix admin font paths and loading 2021-12-27 17:45:06 +00:00
Matt-Yorkley
6ee6fc733d Remove duplicated imports 2021-12-27 17:45:06 +00:00
Matt-Yorkley
28f9f4245d Fix deprecated syntax using @extend with :before 
This is no longer valid scss
 2021-12-27 17:45:06 +00:00
Matt-Yorkley
6f06205eed Switch admin CSS to webpack 2021-12-27 17:45:06 +00:00
Matt-Yorkley
ba583dcf39 Install jquery-ui via yarn 
We can delete the gem once the Javascript part has been handled
 2021-12-27 17:45:06 +00:00
Matt-Yorkley
9d18f318ac Remove Sprockets includes in admin scss 2021-12-27 17:45:06 +00:00
Matt-Yorkley
b33ac49442 Update vendor import paths 2021-12-27 17:45:06 +00:00
Matt-Yorkley
0057dbcb89 Remove Sprockets require statements 2021-12-27 17:45:06 +00:00
Matt-Yorkley
2e194ac312 Switch to npm-based Foundation javascript 2021-12-27 17:45:06 +00:00
Matt-Yorkley
ec2213d2f0 Reduce duplicate import statements 
It looks ike these CSS rules are actually being re-imported multiple times, which is bloating the output.
 2021-12-27 17:45:06 +00:00
Matt-Yorkley
825aeeae04 Migrate images and update assets 2021-12-27 17:45:06 +00:00
Matt-Yorkley
cb27081425 Install Foundation 5.5.2 via yarn 2021-12-27 17:45:05 +00:00
Matt-Yorkley
8dfc30438b Move CSS to Webpacker 2021-12-27 17:45:05 +00:00
Filipe
750411fd15 Merge pull request #8592 from openfoodfoundation/gateway-redirects 
Refactor payment gateway redirects handling
 2021-12-23 21:35:45 +00:00
Filipe
20c0195584 Merge pull request #8017 from cillian/hide-variants-with-no-stock 
When creating backoffice orders hide variants with no stock by default
 2021-12-23 21:34:06 +00:00
Filipe
b256696544 Merge pull request #8549 from mkllnk/deprecate-stripe-connect 
Hide old "Stripe" (StripeConnect) payment method type, keep new Stripe SCA
 2021-12-23 21:33:42 +00:00
Filipe
7560b4e056 Merge pull request #8482 from jibees/6689-search-city-and-state-name 
Search enterprises through name + city and state_name
 2021-12-23 21:33:06 +00:00
Sebastian Castro
708d40ac67 reset_processed_at adds guard clause 2021-12-23 20:41:49 +01:00
Sebastian Castro
ed64b6176f OC will renotify automatically if closing date change 2021-12-23 20:41:49 +01:00
Sebastian Castro
b76defc602 Improve notify producer button 
Add icon
Better confirmation message
Adds tooltip
Adds small icon and change text if already notified
 2021-12-23 20:41:49 +01:00
Sebastian Castro
d18b482b4c Move button rules into dedicate file 2021-12-23 20:41:49 +01:00
Sebastian Castro
eb6797220f Lift order cycle advanced settings UI 2021-12-23 20:41:49 +01:00
Sebastian Castro
95ff3d7a11 Add automatic_notification field in advanced settings 2021-12-23 20:41:49 +01:00
Matt-Yorkley
887879f410 Create job for handling of closing order cycles 2021-12-23 20:41:49 +01:00
Matt-Yorkley
e78cea457c Add :unprocessed scope to OrderCycle 2021-12-23 20:41:42 +01:00
Filipe
24301000bf Merge pull request #8631 from jibees/8625-step2-submit-errors 
SplitCheckout - Handle submit on step2
 2021-12-22 18:30:10 +00:00
Matt-Yorkley
570eb21469 Merge pull request #8638 from cillian/store-payment-captured-at 
Add a :captured_at column on payments to store when they are captured
 2021-12-22 15:21:55 +00:00
Filipe
4001fa985b Merge pull request #8612 from Matt-Yorkley/packing-reports-filtering 
Packing reports filtering
 2021-12-22 13:03:17 +00:00
Matt-Yorkley
f0d54dd083 Tidy up #redirect_to_payment_gateway 2021-12-22 09:58:08 +00:00
Filipe
1cee7b6f17 Merge pull request #8614 from mkllnk/8606-subs-dups 
Synchronise processing of subscriptions and avoid duplicate order creation
 2021-12-21 16:57:46 +00:00
Matt-Yorkley
8016e90e07 Ensure payment method is actually selected 2021-12-20 18:47:22 +00:00
Matt-Yorkley
dd23e3d38a Simplify payment method controller 2021-12-20 18:47:22 +00:00
Matt-Yorkley
b4dab46cf8 Remove unused code for changing required attributes 2021-12-20 18:36:28 +00:00