Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -1897,7 +1897,6 @@ should respond to `call`.
- Add a reference to the Writing Extensions doc [#2851](https://github.com/solidusio/solidus/pull/2851) ([jacobherrington](https://github.com/jacobherrington))
- Add article that documents a Spree::Order journey [#2803](https://github.com/solidusio/solidus/pull/2803) ([benjaminwil](https://github.com/benjaminwil))


## Solidus 2.7.0 (2018-09-14)

### Major Changes
Expand Down Expand Up @@ -2131,7 +2130,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/
[solidus_stock_transfers](https://github.com/solidusio-contrib/solidus_stock_transfers) provides an admin interface to transfer stock between two locations. This used to be included in core but has been extracted to a gem.
- Extract stock transfers to the [solidus_stock_transfers](https://github.com/solidusio-contrib/solidus_stock_transfers) gem. [#2379](https://github.com/solidusio/solidus/pull/2379) ([jhawthorn](https://github.com/jhawthorn))


## Misc

- Generate correct number of codes in BatchBuilder [#2578](https://github.com/solidusio/solidus/pull/2578) ([jhawthorn](https://github.com/jhawthorn))
Expand Down Expand Up @@ -2349,7 +2347,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/
either update their customizations or include the [solidus_legacy_stock_system](https://github.com/solidusio-contrib/solidus_legacy_stock_system)
extension, which provides the old classes.


### Core

- Replace Stock::Coordinator with Stock::SimpleCoordinator [#2199](https://github.com/solidusio/solidus/pull/2199) ([jhawthorn](https://github.com/jhawthorn))
Expand Down Expand Up @@ -2472,8 +2469,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/
- Deprecate support for alternate Kaminari page_method_name [#2115](https://github.com/solidusio/solidus/pull/2115) ([cbrunsdon](https://github.com/cbrunsdon))
- Deprecate update_params_payment_source method [#2227](https://github.com/solidusio/solidus/pull/2227) ([ccarruitero](https://github.com/ccarruitero))



## Solidus 2.3.0 (2017-07-31)

- Rails 5.1 [\#1895](https://github.com/solidusio/solidus/pull/1895) ([jhawthorn](https://github.com/jhawthorn))
Expand Down Expand Up @@ -2538,7 +2533,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/
- Fix typo on the new promotions form [\#2035](https://github.com/solidusio/solidus/pull/2035) ([swcraig](https://github.com/swcraig))
- Use translated model name in admin payment methods form [\#1975](https://github/com/solidusio/solidus/pull/1975) ([tvdeyen](https://github.com/tvdeyen))


### Deprecations
- Renamed `Spree::Gateway` payment method into `Spree::PaymentMethod::CreditCard` [\#2001](https://github.com/solidusio/solidus/pull/2001) ([tvdeyen](https://github.com/tvdeyen))
- Deprecate `#simple_current_order` [\#1915](https://github.com/solidusio/solidus/pull/1915) ([ericsaupe](https://github.com/ericsaupe))
Expand All @@ -2552,7 +2546,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/
- Remove ! from assign\_default\_user\_addresses!, deprecating the old method [\#2019](https://github.com/solidusio/solidus/pull/2019) ([jhawthorn](https://github.com/jhawthorn))
- Emit Spree.url JS deprecation warning in all environments [\#2017](https://github.com/solidusio/solidus/pull/2017) ([jhawthorn](https://github.com/jhawthorn))


## Solidus 2.2.1 (2017-05-09)

- Fix migrating CreditCards to WalletPaymentSource [\#1898](https://github.com/solidusio/solidus/pull/1898) ([jhawthorn](https://github.com/jhawthorn))
Expand Down Expand Up @@ -2581,7 +2574,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/

See the "Admin UI" section below for a full list of changes.


### Core
- `Spree::Order#available_payment_methods` returns an `ActiveRecord::Relation` instead of an array [\#1802](https://github.com/solidusio/solidus/pull/1802) ([luukveenis](https://github.com/luukveenis))
- Product slugs no longer have a minimum length requirement [#1616](https://github.com/solidusio/solidus/pull/1616) ([fschwahn](https://github.com/fschwahn))
Expand Down Expand Up @@ -2664,7 +2656,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/
- Remove `webkit-tap-highlight-color` [\#1792](https://github.com/solidusio/solidus/pull/1792) ([brchristian](https://github.com/brchristian))
- Promotion and Shipping calculators can be created or changed without reloading the page. [#1618](https://github.com/solidusio/solidus/pull/1618) ([jhawthorn](https://github.com/jhawthorn))


### Removals

- Extract expedited exchanges to an extension [\#1691](https://github.com/solidusio/solidus/pull/1691) ([jhawthorn](https://github.com/jhawthorn))
Expand All @@ -2674,7 +2665,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/
- Remove unused payment Javascript [\#1735](https://github.com/solidusio/solidus/pull/1735) ([jhawthorn](https://github.com/jhawthorn))
- Moved `spree/admin/shared/_translations` partial to `spree/admin/shared/_js_locale_data`.


### Deprecations

- Deprecate `Order#has_step?` in favour of `has_checkout_step?` [#1667](https://github.com/solidusio/solidus/pull/1667) ([mamhoff](https://github.com/mamhoff))
Expand All @@ -2687,7 +2677,6 @@ In this version we are beginning to deprecate this using the [`discard`](https:/
- Deprecate `fill_in_quantity` capybara helper [#1710](https://github.com/solidusio/solidus/pull/1710) ([jhawthorn](https://github.com/jhawthorn))
- Deprecate `wait_for_ajax` capybara helper [#1668](https://github.com/solidusio/solidus/pull/1668) ([cbrunsdon](https://github.com/cbrunsdon))


## Solidus 2.1.0 (2017-01-17)

* The OrderUpdater (as used by `order.update!`) now fully updates taxes.
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ group :backend do
gem 'net-http', require: false
end


if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3')
# Need to explicitly declare gems when using ruby 3.0 with older versions of rails. Can be removed when mail 2.8.0 is released.
# - https://bugs.ruby-lang.org/issues/17873
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
- **Join our Slack**: [http://slack.solidus.io/](http://slack.solidus.io/)
- **Solidus Security**: [mailing list](https://groups.google.com/forum/#!forum/solidus-security)


## Table of Contents
- [Supporting Solidus](#supporting-solidus)
- [Summary](#summary)
Expand Down
1 change: 0 additions & 1 deletion api/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

2 changes: 1 addition & 1 deletion api/openapi/errors.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Errors

Error responses for each endpoint are documented. When interacting with an endpoint, make sure to handle all possible errors appropriately.
Error responses for each endpoint are documented. When interacting with an endpoint, make sure to handle all possible errors appropriately.
3 changes: 0 additions & 3 deletions api/openapi/main.hub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,15 @@ pages:
data: >-
# Solidus API


Welcome! This is the documentation for the
[Solidus](https://solidus.io) REST API.


This documentation refers to a stock installation of Solidus.
However, every store may customize their API in any number of ways,
so make sure to ensure the store you are working with conforms to
this documentation or refer to the store's own documentation for
interacting with the API.


Endpoints are grouped by the logical resource they interact with.
Note that some of the endpoints are duplicated, since the same
resource may be accessed at the root level or as the child of
Expand Down
1 change: 0 additions & 1 deletion backend/app/assets/javascripts/spree/backend/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ Spree.ready(function() {
});
});


$.fn.visible = function(cond) { this[cond ? 'show' : 'hide' ]() };

// Apply to individual radio button that makes another element visible when checked
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Spree.prepareImageUploader = function () {
});
};


Spree.ready(function () {
Spree.prepareImageUploader();
});
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ Spree.Models.ImageUpload = Backbone.Model.extend({
'image/gif': true
},


previewFile: function () {
var file = this.get('file'),
that = this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
file in your application and set variables according to
globals/_variables.scss file.
--------------------------------------------------------- */

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.destroy_style, .destroy_header {
float: right;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ h4 { line-height: $h1-font-size }
h5 { line-height: $h1-font-size }
h6 { line-height: $h1-font-size }


// Lists
//--------------------------------------------------------------
ul {
Expand Down
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/adjustments/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<% admin_breadcrumb(link_to plural_resource_name(Spree::Adjustment), spree.admin_order_adjustments_path(@order)) %>
<% admin_breadcrumb(t('spree.new_adjustment')) %>


<% content_for :page_actions do %>
<% end %>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<% admin_breadcrumb(link_to plural_resource_name(Spree::CustomerReturn), spree.admin_order_customer_returns_url(@order)) %>
<% admin_breadcrumb(t('spree.new_customer_return')) %>


<% content_for :page_actions do %>
<% end %>

Expand Down
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/images/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<% admin_breadcrumb(link_to plural_resource_name(Spree::Image), admin_product_images_path(@product)) %>
<% admin_breadcrumb(@image.filename) %>


<% content_for :page_actions do %>
<li><%= link_to t('spree.back_to_images_list'), admin_product_images_url(@product), class: 'btn btn-primary' %></li>
<% end %>
Expand Down
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/images/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<% admin_breadcrumb(plural_resource_name(Spree::Image)) %>


<% content_for :page_actions do %>
<% if can?(:create, Spree::Image) %>
<li>
Expand Down
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/option_types/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<% admin_breadcrumb(link_to plural_resource_name(Spree::OptionType), spree.admin_option_types_path) %>
<% admin_breadcrumb(@option_type.name) %>


<% content_for :page_actions do %>
<li>
<span id="new_add_option_value" data-hook>
Expand Down
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/option_types/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
<% admin_breadcrumb(plural_resource_name(Spree::OptionType)) %>


<% content_for :page_actions do %>
<% if can?(:create, Spree::OptionType) %>
<li id="new_ot_link">
Expand Down
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/orders/cart.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

<% admin_breadcrumb(t('spree.cart')) %>


<div data-hook="admin_order_edit_header">
<%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
</div>
Expand Down
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/orders/confirm.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<% admin_breadcrumb(t('spree.confirm_order')) %>


<%= render partial: 'spree/admin/orders/confirm/customer_details', locals: {order: @order} %>

<% if Spree::Order.checkout_step_names.include?(:delivery) %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<% admin_breadcrumb(t('spree.confirm_order')) %>


<div class="form-buttons filter-actions actions" data-hook="complete-order-button">
<div><%= t('spree.order_please_refresh') %></div><br/>
<%= button_to [:advance, :admin, @order], { class: 'button', method: 'put' } do %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<% admin_breadcrumb(t('spree.customer_details')) %>


<% content_for :page_actions do %>
<% end %>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

<% admin_breadcrumb(t('spree.customer_details')) %>


<% content_for :page_actions do %>
<li><%= link_to t('spree.back_to_orders_list'), admin_orders_path, class: 'btn btn-primary' %></li>
<% end %>


<main class="col-5">
<section>
<%= content_tag :h4, t('spree.account') %>
Expand Down
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/orders/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<% admin_breadcrumb(plural_resource_name(Spree::Order)) %>


<% content_for :page_actions do %>
<li>
<%= link_to t('spree.new_order'), new_admin_order_url, id: 'admin_new_order', class: 'btn btn-primary' %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<% admin_breadcrumb(plural_resource_name(Spree::Payment)) %>
<% admin_breadcrumb(plural_resource_name(Spree::PaymentMethod)) %>


<% content_for :page_actions do %>
<% if can?(:create, Spree::PaymentMethod) %>
<li>
Expand Down
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/payment_methods/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<% admin_breadcrumb(link_to plural_resource_name(Spree::PaymentMethod), spree.admin_payment_methods_path) %>
<% admin_breadcrumb(t('spree.new_payment_method')) %>


<% content_for :page_actions do %>
<% end %>

Expand Down
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/payments/credit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
<% admin_breadcrumb(Spree::Refund.model_name.human) %>


<%= form_tag do %>
<h3><%= Spree::Refund.model_name.human %></h3>
<fieldset data-hook="credit">
Expand Down
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/payments/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
<% admin_breadcrumb(t('spree.new_payment')) %>


<% content_for :page_actions do %>
<% end %>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ $(".variant_autocomplete").variantAutocomplete();

initPromotionActions();


$('#<%= dom_id @promotion_action %>').hide();
$('#<%= dom_id @promotion_action %>').fadeIn();
new Spree.CalculatorEditView({el: $('#<%= dom_id @promotion_action %> .js-calculator-fields')});
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$('#<%= dom_id @promotion_action %>').fadeOut().remove();
$('#<%= dom_id @promotion_action %>').fadeOut().remove();
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<% admin_breadcrumb(link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_path) %>
<% admin_breadcrumb(@promotion_category.name) %>


<%= form_for @promotion_category, url: object_url, method: :put do |f| %>
<fieldset class="no-border-top">
<%= render partial: 'form', locals: { f: f } %>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
<% admin_breadcrumb(plural_resource_name(Spree::PromotionCategory)) %>


<% content_for :page_actions do %>
<% if can?(:create, Spree::PromotionCategory) %>
<li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<% admin_breadcrumb(link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_path) %>
<% admin_breadcrumb(t('spree.new_promotion_category')) %>


<%= form_for :promotion_category, url: collection_url do |f| %>
<fieldset class="no-border-top">
<%= render partial: 'form', locals: { f: f } %>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
$('#<%= dom_id @promotion_rule %>').fadeOut().remove();

$('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
$('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/promotions/_rules.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
</fieldset>
<% end %>


<%= form_for @promotion, url: object_url, method: :put do |f| %>
<fieldset class="no-border-top">
<% if Spree::Config.allow_promotions_any_match_policy %>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<%= render partial: 'spree/admin/promotions/actions/promotion_calculators_with_custom_fields',
locals: { calculators: @calculators, promotion_action: promotion_action, param_prefix: param_prefix } %>
locals: { calculators: @calculators, promotion_action: promotion_action, param_prefix: param_prefix } %>
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/promotions/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
</div>
<% end %>


<%= paginate @promotions, theme: "solidus_admin" %>

<% if @promotions.length > 0 %>
Expand Down
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/properties/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<% admin_breadcrumb(link_to plural_resource_name(Spree::Property), spree.admin_properties_path) %>
<% admin_breadcrumb(@property.name) %>


<%= render partial: 'spree/shared/error_messages', locals: { target: @property } %>

<%= form_for [:admin, @property] do |f| %>
Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/properties/filtered.html.erb
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<%= auto_complete_result @properties, :name %>
<%= auto_complete_result @properties, :name %>
1 change: 0 additions & 1 deletion backend/app/views/spree/admin/properties/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
<% admin_breadcrumb(plural_resource_name(Spree::Property)) %>


<% content_for :page_actions do %>
<% if can?(:create, Spree::Property) %>
<li id="new_property_link">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<% admin_breadcrumb(t('spree.admin.tab.checkout')) %>
<% admin_breadcrumb(plural_resource_name(Spree::RefundReason)) %>


<% content_for :page_actions do %>
<ul class="actions inline-menu">
<% if can?(:create, Spree::RefundReason) %>
Expand Down
Loading