Maikel
86500dc2aa
Merge pull request #7948 from Matt-Yorkley/remove-foundation-js
...
Remove Foundation js
2021-07-20 14:57:29 +10:00
Andy Brett
a93eef38c0
Merge pull request #7923 from vishaldeepak/tooltip-order-cycle-subscription
...
Tooltip added for 'New Schedule' and 'New Order Cycle'
2021-07-19 19:32:09 -07:00
Matt-Yorkley
51f86cfef4
Merge pull request #7941 from apricot12/revert-7307-Show_notification_setting
...
Revert 7307 - Profile only producers need the notifications field
2021-07-19 12:07:26 +02:00
Matt-Yorkley
a739e78ff7
Cache producers AMS data
2021-07-18 12:23:31 +01:00
Matt-Yorkley
03863d2bb2
Delete some other dead frontend code
2021-07-18 11:25:01 +01:00
Matt-Yorkley
e2bcb80ac4
Remove Foundation framework JS from Darkswarm
2021-07-18 11:25:01 +01:00
Andy Brett
84c3b39e15
use zeitwerk for autoloading
2021-07-17 16:41:35 -07:00
Maikel
6de27703af
Merge pull request #7915 from vishaldeepak/payment-state-translation
...
Fixed Bug on payment transalation state
2021-07-16 10:29:53 +10:00
Maikel
f448c95bbe
Merge pull request #7886 from apricot12/invalid_customer_email_subscription_fail
...
Add valid_email2 gem for email validation to fix subscription failures with invalid emails.
2021-07-16 10:20:37 +10:00
Nihal Mohammed
3793585c38
Revert changes made in #7307
2021-07-16 00:28:40 +05:30
Andy Brett
ac0c1f3c70
Merge pull request #7823 from apricot12/Migrate_Kaminari_to_Pagy_for_pagination
...
Migrate kaminari to pagy for pagination
2021-07-14 10:11:11 -07:00
Andy Brett
a58e0fe217
Merge pull request #7926 from luisramos0/rubocop_fix
...
Update Rubocop todo files
2021-07-14 10:05:54 -07:00
Matt-Yorkley
4b4450d34f
Update conditional pagination in Api::OrdersController
2021-07-14 13:19:02 +01:00
Matt-Yorkley
c1b85b7409
Revert removal of default argument in #fetchResults
2021-07-14 13:19:02 +01:00
Matt-Yorkley
cc5b310694
Fix javascript errors where $scope.filteredLineItems hasn't been initialized yet
2021-07-14 13:19:02 +01:00
Nihal Mohammed
6bd28bcad8
Update products_renderer for pagy pagination
2021-07-14 13:17:33 +01:00
Matt-Yorkley
4187380225
Customise partial used for showing pagination links
2021-07-14 13:17:33 +01:00
Matt-Yorkley
786cb06c7d
Drop duplicate pagination buttons on top of tax zones config page
...
Showing these buttons at both the top and bottom is inconsistent with other pages like admin/users that have a similar layout and UI; they only show the buttons on the bottom.
2021-07-14 13:17:33 +01:00
Matt-Yorkley
41f9f07a80
Simplify cases where pagination is conditional and pagination data may or may not be used
2021-07-14 13:17:33 +01:00
Matt-Yorkley
e5afa3a26e
Simplify #pagy calls without default item counts
...
Pagy will pick up the :per_page param by default now, so we don't need to specify `items: params[:per_page]` unless we want to use something beyond that param's value.
2021-07-14 13:17:33 +01:00
Matt-Yorkley
18d98500e9
Update pagination in Admin::ZonesController
2021-07-14 13:17:33 +01:00
Matt-Yorkley
a821117b83
Update pagination in Admin::UsersController
2021-07-14 13:17:33 +01:00
Matt-Yorkley
a146782bcd
Update pagination in Api::StatesController
2021-07-14 13:17:33 +01:00
Matt-Yorkley
eba60a6130
Deal with Api::OrdersController and SearchOrders service
2021-07-14 13:17:33 +01:00
Matt-Yorkley
3213c30a37
Update pagination in Api::ExchangeProductsController
2021-07-14 13:17:33 +01:00
Matt-Yorkley
6fe68322da
Update pagination in Admin::BulkLineItemsController
2021-07-14 13:17:33 +01:00
Matt-Yorkley
1dddaf9b14
Remove dead code in Admin::ProductsController
...
This is related to some of the data-loading for index actions inherited from Spree's Admin::ResourceController, but we don't actually use it any more...
2021-07-14 13:17:33 +01:00
Nihal Mohammed
e5bdaa603a
Setup pagy
2021-07-14 13:17:33 +01:00
vishaldeepak
b70ba7085a
Tooltip added for 'New Schedule' and 'New Order Cycle' in Order Cycles tab of admin
2021-07-14 15:15:12 +05:30
Maikel
3e15e87b11
Merge pull request #7909 from shen-sat/7470-add-shipping-category-feature-test
...
7470 add shipping category feature test
2021-07-14 14:29:29 +10:00
Luis Ramos
1fb162bb4c
Result of running rubocop -a, safe auto correct
2021-07-13 23:06:56 +01:00
Luis Ramos
01fe6abeed
Result of rubocop -a, safe autocorrect
2021-07-13 22:38:05 +01:00
Andy Brett
ef4454ddba
Merge pull request #7892 from andrewpbrett/grouped-tax-invoices
...
Remove duplicative tax line on invoices
2021-07-13 06:30:30 -07:00
Matt-Yorkley
0d16be3f94
Merge pull request #7779 from Matt-Yorkley/stripe-stock-check
...
Stripe stock check
2021-07-13 14:46:34 +02:00
Andy Brett
128a2127c9
use autocomplete: off on bulk product page form
2021-07-12 14:41:57 -07:00
Andy Brett
7d399b4c6d
Remove duplicative line item for taxes
2021-07-12 09:16:28 -07:00
vishaldeepak
691853843d
Fixed Bug on payment transalation state
2021-07-12 15:45:27 +05:30
Matt-Yorkley
8e1631bfc7
Set adjustments associated with voided payments to ineligible.
...
Otherwise we can end up with duplicate transaction fees for voided payments.
2021-07-12 08:28:32 +01:00
Shen Sat
63cb82717b
Add feature test for shipping categories
2021-07-11 19:42:41 +01:00
Matt-Yorkley
cb039fd880
Delete dead code Adjustment#display_included_tax
2021-07-09 21:49:36 +01:00
Matt-Yorkley
12c9914d1b
Delete old Adjustment scopes #with_tax and #without_tax
2021-07-09 21:49:36 +01:00
Matt-Yorkley
0876f2ae0d
Remove tax rate guessing from TaxRateFinder
...
🎉
2021-07-09 21:49:36 +01:00
Matt-Yorkley
f2e63fff2e
Delete dead code TaxRate: #compute_tax and #with_tax_included_in_price
...
🎉
2021-07-09 21:49:36 +01:00
Matt-Yorkley
33fc5bbaa2
Delete dead code TaxRate#compute_tax
...
🎉
2021-07-09 21:49:36 +01:00
Matt-Yorkley
b3f5780862
Refactor OrderTaxAdjustmentsFetcher
...
Note: we're only dealing with tax adjustments here, and each adjustment has a single associated tax rate, not multiple.
2021-07-09 21:49:35 +01:00
Matt-Yorkley
c60554a14a
Update display of associated tax amounts
2021-07-09 21:49:35 +01:00
Matt-Yorkley
ad1b9f3f2f
Update Adjustment#has_tax?
2021-07-09 21:49:35 +01:00
Matt-Yorkley
c16e008ba1
Delete dead code Adjustment#set_absolute_included_tax!
2021-07-09 21:49:35 +01:00
Matt-Yorkley
9215d3292b
Remove edit/delete buttons for shipping and payment adjustments
2021-07-09 21:49:35 +01:00
Matt-Yorkley
ea9724a671
Remove dead code #adjustment_tax_amount and #no_tax_adjustments?
2021-07-09 21:49:35 +01:00
