raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-14 04:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,850 Commits 16 Branches 456 Tags
8b047cd449987ba4cfbf84dcccdb3729bb5839ce
Commit Graph

23850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
05ac7e6798 Comment out leaflet image paths 
These images don't exist anywhere. They were silently ignored before.
 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
bab60f4944 Drop foundation-rails gem 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
54929ab6ed Drop foundation-icons gem 
It looks like we don't actually use these icons anywhere...
 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
Transifex-Openfoodnetwork
6a312b8cca Updating translations for config/locales/it.yml 2021-12-28 03:49:53 +11:00
Matt-Yorkley
f0f5a1a2da Allow methods which skip validations in Rubocop 
There are plenty of places where we use methods which skip validations for perfectly good reasons...
 2021-12-27 16:36:45 +00:00
Matt-Yorkley
aaf5d1ba38 Patch CanCan deprecated keyword arguments 
Solves an issue with use of deprecated positional args. The version of CanCan which fixes this is not currently compatible with OFN...
 2021-12-27 16:27:04 +00:00
Matt-Yorkley
4dc2172dd2 Update deprecated #search method name 
DEPRECATION WARNING: #search is deprecated and will be removed in 2.3, please use #ransack instead (called from search at /home/user/Github/openfoodnetwork/lib/open_food_network/sales_tax_report.rb:40)
 2021-12-27 16:24:33 +00:00
Matt-Yorkley
482879245f Merge pull request #8632 from Matt-Yorkley/default-url-options 
Set default_url_options in all environments
 2021-12-27 12:23:49 +00:00
Matt-Yorkley
15c59d1a93 Merge pull request #8647 from Matt-Yorkley/test-suite-issues 
Fix infinite loop in datepicker selection logic
 2021-12-27 12:19:56 +00:00
Matt-Yorkley
c046f72ca8 Fix infinite loop in datepicker selection logic 2021-12-27 11:17:33 +00:00
Matt-Yorkley
70dc9a170e Remove unnecessary config.autoload_paths 2021-12-25 20:51:55 +00:00
Matt-Yorkley
6aada422fd Fix deprecation warnings around class loading during initialization 
This:
```
DEPRECATION WARNING: Initialization autoloaded the constant User.

Being able to do this is deprecated. Autoloading during initialization is going
to be an error condition in future versions of Rails.

Reloading does not reboot the application, and therefore code executed during
initialization does not run again. So, if you reload User, for example,
the expected changes won't be reflected in that stale Class object.

This autoloaded constant has been unloaded.

In order to autoload safely at boot time, please wrap your code in a reloader
callback this way:

    Rails.application.reloader.to_prepare do
      # Autoload classes and modules needed at boot time here.
    end

That block runs when the application boots, and every time there is a reload.
For historical reasons, it may run twice, so it has to be idempotent.

Check the "Autoloading and Reloading Constants" guide to learn more about how
Rails autoloads and reloads.
```
 2021-12-25 20:51:18 +00:00
Matt-Yorkley
5b5a9ad750 Set default_url_options explicitly in all environments 2021-12-25 13:27:16 +00:00
Matt-Yorkley
b813acdab3 Tidy up (consolidate) setting of the "domain" in dev and test environments 2021-12-25 13:27:16 +00:00
Transifex-Openfoodnetwork
fd3bc76d8b Updating translations for config/locales/en_FR.yml 2021-12-24 20:26:20 +11:00
Transifex-Openfoodnetwork
5d91e05dd0 Updating translations for config/locales/fr.yml 2021-12-24 20:25:42 +11: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
e1664c173a Merge pull request #8622 from openfoodfoundation/transifex 
Transifex
 2021-12-23 21:34:55 +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
Filipe
a3f3d8f96f Merge pull request #8598 from seballot/oc-notify-producers 
Configuration to automatically notify producers on order cycle close
 2021-12-23 21:31:45 +00:00
Matt-Yorkley
860c2ba03c Update spec/models/order_cycle_spec.rb 2021-12-23 20:41:49 +01: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
492325b74a Add automatic_notifications column to order_cycles table 2021-12-23 20:41:49 +01:00