raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-01 02:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,007 Commits 18 Branches 455 Tags
38ea95ea856dcadbb0eb728b95d6a46ce1d2b090
Commit Graph

4219 Commits

Author SHA1 Message Date
Luis Ramos
9e43661127 Merge pull request #5153 from luisramos0/bye_bye_ga 
Bye bye Google Analytics
 2020-04-28 16:09:16 +01:00
Luis Ramos
868929eed3 Merge pull request #4993 from luisramos0/move_ent_fees 
Change engine routes to better work with specs in rails 4
 2020-04-28 11:48:41 +01:00
Luis Ramos
248b0016d4 Remove trackers and google analytics 2020-04-27 18:40:33 +01:00
Luis Ramos
d8d6bad11c Remove config and sections related to google analytics in the cookies banner and cookies page 2020-04-27 18:40:00 +01:00
Luis Ramos
ab16931d70 Merge pull request #5257 from luisramos0/stripe_sca_payments_last 
StripeSCA - reuse better method to fetch last payment of an order to avoid nasty bugs in the future
 2020-04-27 18:34:35 +01:00
Luis Ramos
2984829790 Merge pull request #5253 from luisramos0/edit_order 
Make edit order page work even if inventory_items dont have a corresponding line_item in the order
 2020-04-23 19:27:31 +01:00
Pau Pérez Fabregat
a8ca471cd2 Merge pull request #5189 from Matt-Yorkley/mobile-buttons 
[Mobile UX] Style updates on buttons
 2020-04-23 12:56:49 +02:00
Luis Ramos
52becf6abc Extract payment method logic from OrderPaymentFinder into the orders helper 2020-04-23 16:08:10 +10:00
Luis Ramos
23f4faf192 Merge pull request #4841 from luisramos0/kill_rabl 
Hide broken product taxons field, remove last rabl template and rabl itself
 2020-04-21 18:49:12 +01:00
Luis Ramos
15e56b21ae Merge pull request #5229 from chrishil1/missing_translation 
Added missing translations to enterprise_relationship page
 2020-04-18 18:15:54 +01:00
Luis Ramos
8f8dce4bab Do not render inventory items in the shipment that dont have a line item in the order 2020-04-17 20:23:29 +01:00
chrishil1
a9829ba5d9 Update _enterprise_relationship.html.haml 2020-04-15 17:01:22 -05:00
chrishil1
c3f01be580 Fixed display all required tag 2020-04-15 19:00:35 +01:00
jeffrey s hill md
5e1dea61a8 added missing translations to enterprise_relationship page 2020-04-14 11:20:56 -05:00
Luis Ramos
b5ba2acb21 Merge pull request #5169 from jeduardo824/enhancement/5102-make-shop-names-links 
make shop name a link on /account
 2020-04-09 22:01:34 +01:00
Matt-Yorkley
0414f4984d Align buttons left and right on cart page 2020-04-08 10:55:55 +02:00
Matt-Yorkley
9c421e146e Remove arrows from cart and checkout buttons 2020-04-08 10:23:18 +02:00
Matt-Yorkley
003341ef7a Add loading indicator when showing closed shops 2020-04-07 10:40:49 +02:00
Matt-Yorkley
94f8ea2f93 Fix flicker effect showing 3 buttons when clicking "Show Closed Shops" button 2020-04-07 10:31:56 +02:00
Eduardo
e7b780f963 make shop name a link on /account 2020-04-06 08:34:24 -03:00
Luis Ramos
445eb9f287 Merge pull request #5121 from Matt-Yorkley/flaky-maps-js 
Update vendor/assets/angular-google-maps.min.js
 2020-04-02 22:13:51 +01:00
Pau Pérez Fabregat
fe8beb5448 Merge pull request #5099 from Matt-Yorkley/ticking-time-bom 
Improve BOM
 2020-04-02 16:01:48 +02:00
Matt-Yorkley
40f8cf660c Update vendor/assets/angular-google-maps.min.js 
Fixes an issue where if the js library from maps.googleapis.com failed to load in the <head>, all of our subsequent Angular would completely break.
See: https://github.com/angular-ui/angular-google-maps
Note: `bluebird.js` is a new dependency of `angular-google-maps.js`.
 2020-04-02 13:32:55 +02:00
Luis Ramos
8a220742f5 Merge pull request #5103 from jeduardo824/bug/5092-remove-blue-setence-in-payment-method-setting 
remove blue sentence in payment method setting
 2020-04-01 18:56:09 +01:00
Luis Ramos
9fa604db0d Merge pull request #5076 from luisramos0/rails_f_helper 
Remove Rails Foundation Helper and improve error display and logging in checkout controller
 2020-04-01 18:54:45 +01:00
Matt-Yorkley
ad42b1b485 Remove pagination limits in BOM 
We can re-assess this later, but for now it looks like some of the BOM functionality won't work if results are returned across multiple pages.
 2020-04-01 13:43:21 +02:00
Luis Ramos
ce2a164c66 Stop using f_form_for 
Add labels for some fields, this was done automatically by rails foundation helper
 2020-04-01 12:03:39 +01:00
Matt-Yorkley
f437d0f8a0 Report environment correctly in Bugsnag JS 2020-03-31 15:59:17 +02:00
Matt-Yorkley
e200ece280 Rename partial to bugsnag_js for clarity 2020-03-31 12:57:12 +02:00
Matt-Yorkley
30bf9257ab Move conditional inside partial and use default key as fallback 2020-03-31 12:55:28 +02:00
Matt-Yorkley
03e229da08 Add bugsnag js script to admin layout above all.js 2020-03-31 12:25:42 +02:00
Maikel Linke
28473c9087 Add Bugsnag JS logging 2020-03-31 15:51:04 +11:00
Eduardo
b6da0e2092 remove @payment_method explict variable from the view 2020-03-29 20:32:55 -03:00
Matt-Yorkley
a07281910b Fix dropdown placeholders 2020-03-29 19:54:49 +02:00
Matt-Yorkley
72f9da3ac4 Fix regex validation and HTML "type" settings not allowing decimals for final_weight_volume 
`final_weight_volume` can be a decimal, and often *is* in production data. Not regarding them as valid was breaking the form submission in various cases
 2020-03-29 19:54:49 +02:00
Matt-Yorkley
375b4648dc Add pagination to Bulk Order Management 2020-03-29 19:54:47 +02:00
Matt-Yorkley
d568b45d4a Limit spamming the server with lots of requests 
This uses "debounce" to add a little waiting time whilst the user is part-way through selecting dates (or manually typing in the date filter) so we don't make too many unnecessary requests.
 2020-03-28 11:20:23 +01:00
Maikel
d254df7ccc Merge pull request #5073 from Matt-Yorkley/mobile-checkout 
[Mobile UX] Order cycle section updates
 2020-03-27 15:34:19 +11:00
Matt-Yorkley
c3283adcf5 Show full-width ordercycle subheader on tablet and below 2020-03-25 23:12:23 +01:00
Matt-Yorkley
7a3549209f Use 4 columns on checkout sidebar 2020-03-25 23:12:23 +01:00
Matt-Yorkley
91e88bd028 Allow conditional use of order cycle sidebar 
We need to re-use the "shopping_shared/header" partial in multiple places, but we don't always want the (nested) order cycle sidebar inside it.
 2020-03-25 23:07:39 +01:00
Matt-Yorkley
f5e254a105 Remove quick fix for hiding oc selector 2020-03-25 23:07:39 +01:00
Luis Ramos
bddfa95eb5 Fix broken new property button in properties page 2020-03-24 21:50:49 +00:00
Luis Ramos
26cd0f4a9d Merge pull request #5023 from mkllnk/5019-invoice-bill-address 
Display shipping and billing address on invoices
 2020-03-21 20:38:00 +00:00
Matt-Yorkley
62a00b17a2 Merge pull request #5026 from Matt-Yorkley/checkout_display 
Temporarily hide OC selector in checkout page
 2020-03-20 18:33:47 +01:00
Pau Pérez Fabregat
c4f96a1dcf Merge pull request #4972 from mkllnk/4810-tab-navigation 
4810 Shop tab / page navigation with browser buttons
 2020-03-20 15:24:50 +01:00
Matt-Yorkley
e8692fec4c Temporarily hide OC selector in checkout page 2020-03-20 12:08:58 +01:00
Luis Ramos
a8078b22f8 Move enterprise fees summaries controller and views to ordermanagement engine 2020-03-20 11:07:23 +00:00
Luis Ramos
3b2c10526d Merge pull request #4838 from openfoodfoundation/dependabot/bundler/jquery-rails-3.1.5 
[Security] Bump jquery-rails from 3.0.4 to 3.1.5
 2020-03-20 09:49:22 +00:00
Maikel Linke
25b11f1f4b Display delivery details in the header 2020-03-20 15:51:49 +11:00