workarea-api-admin 4.4.6 → 4.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fa92eaf4f9148dae8ffba798b4acd8af62d8bfffab4e7da7ea981ad47719334
-  data.tar.gz: 4240b7bb56d687a50a7849e865243aff1141b84405c8c1457f50fab3460bf38f
+  metadata.gz: 81c2568b51d648907bd12c63596d693fd7e0891188eba09f44986ebe7f03aed5
+  data.tar.gz: 9b3810180b668eb59f17e6d27ed92890710d442bd335de7fa572ce45b4e917c4
 SHA512:
-  metadata.gz: ce2bf523e985e185a72754db8620242dacd236e5f3b18d90bf982bbed7b408a804ca45a567034f1e654a6d21d97d13974848ebca41794cddabac3da58ba82ce9
-  data.tar.gz: 1543e6e42c32a73e3f96f2996eaaa4d74e4800b959302057f8a4cf25b04001413da98cc67ac22b01f8180cf00aa3818b088447d9a20b1c32cfa6e5513adafb8d
+  metadata.gz: f857a9f9dc07e1b46b1788b0afc7a240e9b60fb456afa8301fb254ccbee21957c47585ee8fd822784da4e9f0e1d80bcde07c3e87a75b761119c48bdf1f777434
+  data.tar.gz: 8d2d3759c8a290d4d309152c02c9988ab296a6be01bdf4490f7d53e28515c9ddf4aa6df87e6d7fe35369c15dd48d62e060b2a5bfa56636c0585510b7a042b60e

data/LICENSE

@@ -0,0 +1,52 @@
+WebLinc
+Business Source License
+
+Licensor: WebLinc Corporation, 22 S. 3rd Street, 2nd Floor, Philadelphia PA 19106
+
+Licensed Work: Workarea Commerce Platform
+               The Licensed Work is (c) 2019 WebLinc Corporation
+
+Additional Use Grant:
+                      You may make production use of the Licensed Work without an additional license agreement with WebLinc so long as you do not use the Licensed Work for a Commerce Service.
+
+                      A "Commerce Service" is a commercial offering that allows third parties (other than your employees and contractors) to access the functionality of the Licensed Work by creating or managing commerce functionality, the products, taxonomy, assets and/or content of which are controlled by such third parties. 
+
+                      For information about obtaining an additional license agreement with WebLinc, contact licensing@workarea.com.
+
+Change Date: 2019-08-20
+
+Change License: Version 2.0 or later of the GNU General Public License as published by the Free Software Foundation
+
+Terms
+
+The Licensor hereby grants you the right to copy, modify, create derivative works, redistribute, and make non-production use of the Licensed Work. The Licensor may make an Additional Use Grant, above, permitting limited production use.
+
+Effective on the Change Date, or the fourth anniversary of the first publicly available distribution of a specific version of the Licensed Work under this License, whichever comes first, the Licensor hereby grants you rights under the terms of the Change License, and the rights granted in the paragraph above terminate.
+
+If your use of the Licensed Work does not comply with the requirements currently in effect as described in this License, you must purchase a commercial license from the Licensor, its affiliated entities, or authorized resellers, or you must refrain from using the Licensed Work.
+
+All copies of the original and modified Licensed Work, and derivative works of the Licensed Work, are subject to this License. This License applies separately for each version of the Licensed Work and the Change Date may vary for each version of the Licensed Work released by Licensor.
+
+You must conspicuously display this License on each original or modified copy of the Licensed Work. If you receive the Licensed Work in original or modified form from a third party, the terms and conditions set forth in this License apply to your use of that work.
+
+Any use of the Licensed Work in violation of this License will automatically terminate your rights under this License for the current and all other versions of the Licensed Work.
+
+This License does not grant you any right in any trademark or logo of Licensor or its affiliates (provided that you may use a trademark or logo of Licensor as expressly required by this License). TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE. MariaDB hereby grants you permission to use this License’s text to license your works and to refer to it using the trademark "Business Source License" as long as you comply with the Covenants of Licensor below.
+
+Covenants of Licensor
+In consideration of the right to use this License’s text and the "Business Source License" name and trademark, Licensor covenants to MariaDB, and to all other recipients of the licensed work to be provided by Licensor:
+
+To specify as the Change License the GPL Version 2.0 or any later version, or a license that is compatible with GPL Version 2.0 or a later version, where "compatible" means that software provided under the Change License can be included in a program with software provided under GPL Version 2.0 or a later version. Licensor may specify additional Change Licenses without limitation.
+
+To either: (a) specify an additional grant of rights to use that does not impose any additional restriction on the right granted in this License, as the Additional Use Grant; or (b) insert the text "None."
+
+To specify a Change Date.
+
+Not to modify this License in any other way.
+
+Notice
+The Business Source License (this document, or the "License") is not an Open Source license. However, the Licensed Work will eventually be made available under an Open Source License, as stated in this License.
+
+For more information on the use of the Business Source License generally, please visit the Adopting and Developing Business Source License FAQ.
+
+License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved. "Business Source License" is a trademark of MariaDB Corporation Ab.

data/README.md

@@ -67,14 +67,11 @@ https://youruser@example.com:Password!1@yourtotallyamazingstore.com/api/swagger.
 Point your Swagger client to this endpoint to be able to use and browse
 the Swagger documentation for our API.
 
-## Copyright & Licensing
+License
+--------------------------------------------------------------------------------
+Workarea Commerce Platform is released under the [Business Software License](https://github.com/workarea-commerce/workarea/blob/master/LICENSE)
 
-Copyright Workarea 2017-2019. All rights reserved.
-
-For licensing, contact [sales@workarea.com][].
-
-[Workarea API]: https://homebase.weblinc.com/plugins/workarea-api-admin
-[sales@workarea.com]: mailto:sales@workarea.com
+[Workarea API]: https://github.com/workarea-commerce/workarea-api
 [HTTP Basic Authentication]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication#Basic_authentication_scheme
 [OpenAPI]: https://swagger.io/resources/open-api/
 [Swagger]: https://swagger.io

data/app/controllers/workarea/api/admin/categories_controller.rb

@@ -35,6 +35,10 @@ module Workarea
               key :enum, %w(asc desc)
               key :default, 'desc'
             end
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
 
             response 200 do
               key :description, 'Categories'
@@ -97,6 +101,8 @@ module Workarea
         def index
           @categories = Catalog::Category
                           .all
+                          .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                          .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                           .order_by(sort_field => sort_direction)
                           .page(params[:page])
 

data/app/controllers/workarea/api/admin/content_assets_controller.rb

@@ -35,6 +35,10 @@ module Workarea
               key :enum, %w(asc desc)
               key :default, 'desc'
             end
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
 
             response 200 do
               key :description, 'Content assets'
@@ -97,6 +101,8 @@ module Workarea
         def index
           @assets = Content::Asset
                       .all
+                      .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                      .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                       .order_by(sort_field => sort_direction)
                       .page(params[:page])
 

data/app/controllers/workarea/api/admin/content_controller.rb

@@ -35,6 +35,10 @@ module Workarea
               key :enum, %w(asc desc)
               key :default, 'desc'
             end
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
 
             response 200 do
               key :description, 'Content'
@@ -97,6 +101,8 @@ module Workarea
         def index
           @content = Content
                         .all
+                        .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                        .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                         .order_by(sort_field => sort_direction)
                         .page(params[:page])
 

data/app/controllers/workarea/api/admin/discounts_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Discounts'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @discounts = Pricing::Discount
                           .all
+                          .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                          .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                           .order_by(sort_field => sort_direction)
                           .page(params[:page])
 

data/app/controllers/workarea/api/admin/email_signups_controller.rb

@@ -2,6 +2,8 @@ module Workarea
   module Api
     module Admin
       class EmailSignupsController < Admin::ApplicationController
+        before_action :find_email_signup, only: :show
+
         swagger_path '/email_signups' do
           operation :get do
             key :summary, 'All Email Signups'
@@ -34,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Email Signups'
               schema do
@@ -52,22 +59,24 @@ module Workarea
         def index
           @email_signups = Email::Signup
                             .all
+                            .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                            .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                             .order_by(sort_field => sort_direction)
                             .page(params[:page])
 
           respond_with email_signups: @email_signups
         end
 
-        swagger_path '/email_signups/{id}' do
+        swagger_path '/email_signups/{id_or_email}' do
           operation :get do
-            key :summary, 'Find Email Signup by ID'
+            key :summary, 'Find Email Signup by ID or Email Address'
             key :description, 'Returns a single email signup'
             key :operationId, 'showEmailSignup'
 
             parameter do
               key :name, :id
               key :in, :path
-              key :description, 'ID of email signup to fetch'
+              key :description, 'ID or URI escaped email of email signup to fetch'
               key :required, true
               key :type, :string
             end
@@ -99,9 +108,16 @@ module Workarea
         end
 
         def show
-          @email_signup = Email::Signup.find(params[:id])
           respond_with email_signup: @email_signup
         end
+
+        private
+
+        def find_email_signup
+          @email_signup = Email::Signup.find(params[:id])
+        rescue Mongoid::Errors::DocumentNotFound
+          @email_signup = Email::Signup.find_by(email: URI.unescape(params[:id]))
+        end
       end
     end
   end

data/app/controllers/workarea/api/admin/fulfillments_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Fulfillments'
               schema do
@@ -54,9 +59,9 @@ module Workarea
         def index
           @fulfillments = Fulfillment
                             .all
+                            .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
                             .order_by(sort_field => sort_direction)
                             .page(params[:page])
-
           respond_with fulfillments: @fulfillments
         end
 

data/app/controllers/workarea/api/admin/inventory_skus_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Inventory SKUs'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @inventory_skus = Inventory::Sku
                               .all
+                              .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                              .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                               .order_by(sort_field => sort_direction)
                               .page(params[:page])
 

data/app/controllers/workarea/api/admin/navigation_menus_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Navigation Menus'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @navigation_menus = Navigation::Menu
                     .all
+                    .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                    .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                     .order_by(sort_field => sort_direction)
                     .page(params[:page])
 

data/app/controllers/workarea/api/admin/navigation_taxons_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Navigation taxons'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @navigation_taxons = Navigation::Taxon
                     .all
+                    .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                    .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                     .order_by(sort_field => sort_direction)
                     .page(params[:page])
 

data/app/controllers/workarea/api/admin/orders_controller.rb

@@ -47,6 +47,18 @@ module Workarea
               key :type, :string
               key :format, 'date-time'
             end
+            parameter do
+              key :name, :email
+              key :in, :query
+              key :description, 'Email address associated to the orders'
+              key :required, false
+              key :type, :integer
+            end
+
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
 
             response 200 do
               key :description, 'Orders'
@@ -66,6 +78,10 @@ module Workarea
         def index
           criteria = Order.all
 
+          if params[:email].present?
+            criteria = criteria.where(email: params[:email])
+          end
+
           if params[:placed_at_greater_than].present?
             # TODO Workarea v4, rename to placed_at_starts_at
             criteria = criteria.where(:placed_at.gte => params[:placed_at_greater_than])
@@ -73,11 +89,13 @@ module Workarea
 
           if params[:placed_at_less_than].present?
             # TODO Workarea v4, rename to placed_at_ends_at
-            criteria = criteria.where(:placed_at.lt => params[:placed_at_less_than])
+            criteria = criteria.where(:placed_at.lte => params[:placed_at_less_than])
           end
 
           @orders =
             criteria
+            .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+            .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
             .order_by(sort_field => sort_direction)
             .page(params[:page].presence || 1)
 

data/app/controllers/workarea/api/admin/pages_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Pages'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @pages = Content::Page
                       .all
+                      .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                      .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                       .order_by(sort_field => sort_direction)
                       .page(params[:page])
 

data/app/controllers/workarea/api/admin/payment_profiles_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Payment profiles'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @payment_profiles = Payment::Profile
                                 .all
+                                .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                                .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                                 .order_by(sort_field => sort_direction)
                                 .page(params[:page])
 

data/app/controllers/workarea/api/admin/payment_transactions_controller.rb

@@ -34,6 +34,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Payment transactions'
               schema do
@@ -52,6 +57,8 @@ module Workarea
         def index
           @transactions = Payment::Transaction
                             .all
+                            .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                            .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                             .order_by(sort_field => sort_direction)
                             .page(params[:page])
 

data/app/controllers/workarea/api/admin/payments_controller.rb

@@ -34,6 +34,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Payments'
               schema do
@@ -52,6 +57,8 @@ module Workarea
         def index
           @payments = Payment
                         .all
+                        .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                        .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                         .order_by(sort_field => sort_direction)
                         .page(params[:page])