solidus_marketplace 0.1.0

data/app/views/spree/admin/suppliers/index.html.erb

@@ -0,0 +1,68 @@
+<%# Updated icon %>
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t('new_supplier'), new_object_url, icon: 'add', class: 'btn-success' %>
+<% end %>
+
+<% admin_breadcrumb(plural_resource_name(Spree::Supplier)) %>
+
+<% content_for :table_filter_title do %>
+  <%= Spree.t(:search) %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <div data-hook='admin_suppliers_filter'>
+    <%= search_form_for [:admin, @search] do |f| %>
+        <div class="form-group">
+          <%= f.label :name_cont, Spree.t(:name) %>
+          <%= f.text_field :name_cont, :size => 15, class: "form-control" %>
+        </div>
+      <div class="clear"></div>
+      <div class="form-actions" data-hook="admin_suppliers_index_search_buttons">
+        <%= button Spree.t(:search), 'search' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<%= paginate @collection, theme: "solidus_admin" %>
+
+<% if @collection.any? %>
+  <table class="table" id="listing_suppliers">
+    <thead>
+      <tr data-hook='admin_suppliers_index_headers'>
+        <th><%= sort_link @search, :name,  Spree::Supplier.human_attribute_name(:name) %></th>
+        <th><%= sort_link @search, :email, Spree::Supplier.human_attribute_name(:email) %></th>
+        <th><%= Spree.t(:users) %></th>
+        <th><%= sort_link @search, :active, Spree::Supplier.human_attribute_name(:active) %></th>
+        <th data-hook="admin_suppliers_index_header_actions" class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+    <%# Updated classes! %>
+      <%- @collection.each do |supplier| %>
+        <tr <%= "style='color: red;'" if supplier.deleted? %> id="<%= spree_dom_id supplier %>" data-hook="admin_suppliers_index_rows" class="<%= cycle('odd', 'even') %>">
+          <!--todo: Fix this link!-->
+          <td><%= link_to supplier.name, edit_object_url(supplier) %></td>
+          <td><%= mail_to supplier.email %></td>
+          <td><%= supplier.users.pluck(:email).join(', ') %></td>
+          <td><%= supplier.active %></td>
+          <td class='actions actions-3' data-hook='admin_suppliers_index_row_actions'>
+            <% unless supplier.deleted? %>
+              <%= link_to_edit supplier, :no_text => true, :class => 'edit' %>
+              <%= link_to_delete supplier, :no_text => true %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <%# New alert with link to add new supplier %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::Supplier.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_supplier_path %>!
+  </div>
+<% end %>
+
+<%# This is a new paginate! %>
+<%= paginate @collection, theme: "solidus_admin" %>

data/app/views/spree/admin/suppliers/new.html.erb

@@ -0,0 +1,17 @@
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t('back_to_suppliers'), spree.admin_suppliers_path, icon: 'arrow-left' %>
+<% end %>
+
+<% content_for :page_title do %>
+   <%= Spree.t('new_supplier') %>
+<% end %>
+
+<%= render 'spree/shared/error_messages', target: @object%>
+
+<%= form_for [:admin, @object] do |f| %>
+  <%= render "form", form: f %>
+  <%# render 'create' and 'cancel'  buttons %>
+  <div class="col-md-8">
+    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  </div>
+<% end %>

data/app/views/spree/api/shared/_pagination.json.jbuilder

@@ -0,0 +1,5 @@
+json.count        pagination.count
+json.total_count  pagination.total_count
+json.current_page pagination.current_page
+json.pages        pagination.total_pages
+json.per_page     pagination.limit_value

data/app/views/spree/api/suppliers/_supplier.json.jbuilder

@@ -0,0 +1 @@
+json.(supplier, *supplier_attributes)

data/app/views/spree/api/suppliers/index.json.jbuilder

@@ -0,0 +1,4 @@
+json.suppliers(@suppliers) do |supplier|
+  json.partial!("spree/api/suppliers/supplier", supplier: supplier)
+end
+json.partial! 'spree/api/shared/pagination', pagination: @suppliers

data/app/views/spree/marketplace_order_mailer/supplier_order.html.erb

@@ -0,0 +1,119 @@
+<table cellspacing="0" cellpadding="0" border="0" width="100%">
+  <tbody>
+    <tr>
+      <td align="center" valign="top" style="padding:20px 0 20px 0">
+        <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #e0e0e0">
+          <tbody>
+            <tr>
+              <td valign="top">
+                <figure id="logo" data-hook><%= link_to image_tag(Spree::Config[:logo]), spree.root_url %></figure>
+              </td>
+            </tr>
+            <tr>
+              <td valign="top">
+                <h1 style="font-size:22px;font-weight:normal;line-height:22px;"><%= Spree.t('marketplace_order_mailer.
+      supplier_order.hello', name: @supplier.name ) %></h1>
+                <p style="font-size:12px;line-height:16px;margin:0">
+                  An order has been placed.  Please confirm the shipment details, and <%= link_to 'update the shipment', spree.edit_admin_shipment_url(@shipment) %> once it has shipped.
+                </p>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <h2 style="font-size:18px;font-weight:normal;">Reference Number: <%= @shipment.number %></h2>
+                <h4 style="font-size:14px;font-weight:normal;">Placed on: <%= @shipment.created_at.strftime('%A %b %e, %Y at %l:%M%p %Z') %></h4>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <table cellspacing="0" cellpadding="0" border="0" width="650">
+                  <thead>
+                    <tr>
+                      <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px;padding:5px 9px 6px 9px;line-height:1em">Shipping Information:</th>
+                      <th width="10"></th>
+                      <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px;padding:5px 9px 6px 9px;line-height:1em">Shipping Method:</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <td valign="top" style="font-size:12px;padding:7px 9px 9px 9px;border-left:1px solid #eaeaea;border-bottom:1px solid #eaeaea;border-right:1px solid #eaeaea">
+                        <%= @shipment.order.ship_address.firstname %> <%= @shipment.order.ship_address.lastname %><br/>
+                        <%= @shipment.order.ship_address.address1 %><br/>
+                        <% unless @shipment.order.ship_address.address2.blank? %><%= @shipment.order.ship_address.address2 %><br/><% end %>
+                        <%= @shipment.order.ship_address.city %>, <%= @shipment.order.ship_address.state.name %> <%= @shipment.order.ship_address.zipcode %><br/>
+                        <%= @shipment.order.ship_address.country.name %><br/>
+                        T: <a href="tel:<%= @shipment.order.ship_address.phone %>" value="<%= @shipment.order.ship_address.phone %>" target="_blank"><%= @shipment.order.ship_address.phone %></a>
+                      </td>
+                      <td>&nbsp;</td>
+                      <td valign="top" style="font-size:12px;padding:7px 9px 9px 9px;border-left:1px solid #eaeaea;border-bottom:1px solid #eaeaea;border-right:1px solid #eaeaea">
+                        <%= @shipment.shipping_method.name %><br/>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+                  <br>
+                  <table cellspacing="0" cellpadding="0" border="0" width="650" style="border:1px solid #eaeaea">
+                    <thead>
+                      <tr>
+                        <th align="left" bgcolor="#EAEAEA" style="font-size:13px;padding:3px 9px">Item</th>
+                        <th align="left" bgcolor="#EAEAEA" style="font-size:13px;padding:3px 9px">Sku</th>
+                        <th align="center" bgcolor="#EAEAEA" style="font-size:13px;padding:3px 9px">Qty</th>
+                        <th align="right" bgcolor="#EAEAEA" style="font-size:13px;padding:3px 9px">Subtotal</th>
+                      </tr>
+                    </thead>
+                    <tbody bgcolor="#F6F6F6">
+                      <% @shipment.line_items.each do |line_item| %>
+                        <tr>
+                          <td align="left" valign="top" style="font-size:11px;padding:3px 9px;border-bottom:1px dotted #cccccc">
+                            <strong style="font-size:11px"><%= line_item.variant.name %></strong>
+                          </td>
+                          <td align="left" valign="top" style="font-size:11px;padding:3px 9px;border-bottom:1px dotted #cccccc"><%= line_item.variant.sku %></td>
+                          <td align="center" valign="top" style="font-size:11px;padding:3px 9px;border-bottom:1px dotted #cccccc"><%= line_item.quantity %></td>
+                          <td align="right" valign="top" style="font-size:11px;padding:3px 9px;border-bottom:1px dotted #cccccc">
+                            <span><%= line_item.display_amount %></span>
+                          </td>
+                        </tr>
+                      <% end %>
+                    </tbody>
+                    <tbody>
+                      <tr>
+                        <td colspan="3" align="right" style="padding:3px 9px">
+                          Subtotal
+                        </td>
+                        <td align="right" style="padding:3px 9px">
+                          <span><%= @shipment.display_item_cost %></span>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td colspan="3" align="right" style="padding:3px 9px">
+                          Shipping &amp; Handling
+                        </td>
+                        <td align="right" style="padding:3px 9px">
+                          <span><%= @shipment.display_final_price %></span>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td colspan="3" align="right" style="padding:3px 9px">
+                          <strong>Grand Total</strong>
+                        </td>
+                        <td align="right" style="padding:3px 9px">
+                          <strong><span><%= @shipment.display_final_price_with_items %></span></strong>
+                        </td>
+                      </tr>
+                    </tbody>
+                  </table>
+              </td>
+            </tr>
+            <tr>
+              <td bgcolor="#EAEAEA" align="center" style="background:#eaeaea;text-align:center">
+                <center>
+                  <p style="font-size:12px;margin:0"><%= raw Spree.t('marketplace_order_mailer.supplier_order.thank_you_again', name: Spree::Store.current.name) %></p>
+                </center>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </td
+    </tr>
+  </tbody>
+</table>

data/app/views/spree/shared/unauthorized.erb

@@ -0,0 +1 @@
+<%= Spree.t(:authorization_failure) %>

data/app/views/spree/supplier_mailer/welcome.html.erb

@@ -0,0 +1,53 @@
+<table cellspacing="0" cellpadding="0" border="0" width="100%">
+  <tbody>
+    <tr>
+      <td align="center" valign="top" style="padding:20px 0 20px 0">
+        <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #e0e0e0">
+          <tbody>
+            <tr>
+              <td valign="top">
+                <h1><%= link_to Spree::Store.default.name, spree.root_url %></h1>
+              </td>
+            </tr>
+            <tr>
+              <td valign="top">
+                <h1 style="font-size:22px;font-weight:normal;line-height:22px;"><%= Spree.t('supplier_mailer.welcome.hello', name: @supplier.name ) %></h1>
+                <p style="font-size:12px;line-height:16px;">
+                  <%= Spree.t('supplier_mailer.welcome.manage_your_account' ) %>
+                  <%= link_to Spree.t('supplier_mailer.welcome.logging_into_your_account'), spree.login_url, target: '_blank' %>
+                </p>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <h2 style="font-size:18px;font-weight:normal;"><%= Spree.t('supplier_mailer.welcome.please_verify_your_information') %></h2>
+                <table cellspacing="0" cellpadding="0" border="0" width="650">
+                  <thead>
+                    <tr>
+                      <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px;padding:5px 9px 6px 9px;line-height:1em"><%= Spree.t('supplier_mailer.welcome.supplier_information') %></th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <td valign="top" style="font-size:12px;padding:7px 9px 9px 9px;border-left:1px solid #eaeaea;border-bottom:1px solid #eaeaea;border-right:1px solid #eaeaea">
+                        <b><%= Spree.t(:name) %>:</b> <%= @supplier.name %><br/>
+                        <b><%= Spree.t(:email) %>:</b> <%= mail_to @supplier.email %><br/>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </td>
+            </tr>
+            <tr>
+              <td bgcolor="#EAEAEA" align="center" style="background:#eaeaea;text-align:center">
+                <center>
+                  <p style="font-size:12px;margin:0"><%= raw Spree.t('supplier_mailer.welcome.thank_you_again', name: Spree::Store.default.name) %></p>
+                </center>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </td>
+    </tr>
+  </tbody>
+</table>

data/config/locales/en.yml

@@ -0,0 +1,107 @@
+en:
+  activerecord:
+    attributes:
+      spree/supplier:
+        commission_flat_rate: Commission Flat Rate
+        commission_percentage: Commission Percentage
+        name: Name
+        tax_id: TAX ID
+        url: URL
+    models:
+      spree/supplier:
+        one: Supplier
+        other: Suppliers
+    errors:
+      models:
+        spree/supplier:
+          attributes:
+            url:
+              invalid: is invalid. Please be sure to include include 'http://'
+              not_responding: 'is invalid, not responding or redirecting to another location'
+  spree:
+    admin:
+      tab:
+        stock_locations: Stock Locations
+        suppliers: Suppliers
+        shipments: Shipments
+        profile: Profile
+        earnings: Earnings
+      marketplace_settings:
+        update:
+          success: Marketplace settings successfully updated.
+      orders:
+        edit:
+          approve_marketplace_orders: Approve Marketplace Orders
+          resend_marketplace_orders: Resend Marketplace Orders
+          marketplace_order_approval_confirmation: This will send an email notification to each supplier. Continue?
+        show:
+          approve_marketplace_orders: Approve Marketplace Orders
+          resend_marketplace_orders: Resend Marketplace Orders
+          marketplace_order_approval_confirmation: This will send an email notification to each supplier. Continue?
+    back_to_orders_list: Back To Orders List
+    back_to_suppliers: Back To Suppliers
+    business: Business
+    cancel: Cancel
+    company_info: Company Info
+    confirm_order: Confirm Order
+    contact_address: Contact Address
+    automatically_deliver_orders_to_supplier: Automatically Deliver Orders To Supplier
+    send_supplier_email: Send Welcome Email to New Suppliers
+    default_commission_percentage: Default Commission Percentage
+    default_commission_flat_rate: Default Commission Flat Rate
+    drop_ship: Drop Ship
+    earnings: Earnings
+    earnings_description: Earnings for Suppliers over the specified time period
+    marketplace_order_mailer:
+      supplier_order:
+        hello: "Hello %{name},"
+        subject: "%{name} Marketplace Order #%{number}"
+        thank_you_again: "Thank you again for your business, <b>%{name}</b>"
+    marketplace_order_number: "Marketplace Order #%{number}"
+    marketplace_orders: Marketplace Orders
+    marketplace_settings: Marketplace Settings
+    editing_supplier: Editing Supplier
+    individual: Individual
+    manage: Manage
+    must_be_logged_in: 'Must Be Logged In'
+    name: Name
+    new_supplier: New Supplier
+    or: or
+    order_state:
+      active: Active
+      completed: Completed
+      confirmed: Confirmed
+      delivered: Delivered
+    resend_order_to_supplier: Resend Order To Supplier
+    save: Save
+    search: Search
+    send_order_to_supplier: Send Order To Supplier
+    shared:
+      unauthorized:
+        explained: You are not authorized to access this page.
+        unauthorized: Unauthorized
+    show_only_incomplete_orders: Show Only Incomplete Orders
+    signup: Sign Up
+    signup_to_become_a_supplier: 'Sign Up To Become A Supplier'
+    supplier: Supplier
+    supplier_details: Supplier Details
+    supplier_earnings: Supplier Earnings
+    supplier_info: Supplier Info
+    supplier_information: Supplier Information
+    supplier_mailer:
+      welcome:
+        hello: "Hello %{name},"
+        logging_into_your_account: logging into your account.
+        manage_your_account: You may now manage your profile and inventory by
+        subject: 'Thank you for signing up.  Please verify your information.'
+        thank_you_again: "Thank you again for your business, <b>%{name}</b>"
+        thank_you_for_signing_up: Thank you for signing up to be a supplier.
+    supplier_paypal_email: PayPal Email
+    supplier_placeholder: Add a Supplier
+    supplier_registration:
+      already_signed_up: "You've already signed up to become a supplier."
+      create:
+        invalid_password: Invalid password please sign in or sign up.
+        success: Thank you for signing up!
+    supplier_signup: Supplier Sign Up
+    suppliers: Suppliers

data/config/locales/es.yml

@@ -0,0 +1,133 @@
+es:
+  activerecord:
+    attributes:
+      spree/supplier:
+        commission_flat_rate: Tarifa fija de comisión
+        commission_percentage: Porcentaje de comisión
+        name: Nombre
+        tax_id: TAX ID
+        url: URL
+        address1: Dirección
+        address2: Dirección (continuación)
+        city: Ciudad
+        commission: Comisión
+        country: País
+        email: Email
+        state: Estado
+        active: Activo
+        url: URL
+        zipcode: Código Postal(ZipCode)
+        supplier_info: Información de proveedor
+        supplier_signup: Registro de proveedor
+        suppliers: Proveedores
+      spree/shipment:
+        created_at: Creado
+        number: Número
+        state: Estatus
+        item_cost: Costo ítem
+        cost: Costo
+        total_tax: Total impuesto
+        final_price: Precio final
+        supplier_commission: Comisión Proveedor
+    errors:
+      models:
+        spree/supplier:
+          attributes:
+            url:
+              invalid: es inválido. Por favor asegúrece que 'http://' esté incluido
+              not_responding: 'es inválido, no responde o ha redireccionado a otra url'
+  marketplace_order_number: "Mercado Orden #%{number}"
+  marketplace_orders: Mercado Ordenes
+  marketplace_settings: Mercado Configuración
+  must_be_logged_in: 'Debe Estar Autenticado'
+  signup: Registro
+  signup_to_become_a_supplier: 'Autentíquese para ser un Proveedor'
+  spree:
+    admin:
+      marketplace_settings:
+        update:
+          success: Configuración mercado actualizada correctamente
+      orders:
+        marketplace_order_order_header:
+          marketplace_order_ids: DSO IDs
+        edit:
+          approve_marketplace_orders: Ordenes aprobadas por el proveedor
+          resend_marketplace_orders: Reenviar ordenes al proveedor
+          marketplace_order_approval_confirmation: Se le enviará una notificación por correo electrónico a cada proveedor. ¿Desea continuar?
+        show:
+          approve_marketplace_orders: Ordene aprobadas por el proveedor
+          resend_marketplace_orders: Reenviar ordenes al proveedor
+          marketplace_order_approval_confirmation: Se le enviará una notificación por correo electrónico a cada proveedor. ¿Desea continuar?
+      suppliers:
+        edit:
+          back_to_suppliers: Regresar a los proveedores 
+        new:
+          new_supplier: Nuevo Proveedor
+        form:
+          supplier_details: Detalles del Proveedor
+          supplier_address: Dirección del Proveedor
+      marketplace_orders:
+        deliver:
+          error: "La orden %{number} no pudo ser enviada al proveedor."
+          success: "La orden %{number} fue enviada al proveedor."
+        orders_sent: Todas las ordenes fueron enviadas a los proveedores
+        orders_not_sent: Algunas o todas las ordenes no pudieron ser enviadas. Por favor contacte directamente al proveedor.
+    back_to_orders_list: Regresar a las ordenes
+    back_to_suppliers: Regresar a los proveedores
+    business: Negocio
+    cancel: Cancelar
+    company_info: Informacion de la compañia
+    confirm_order: Confirmar Orden
+    contact_address: Dirección de contacto
+    drop_ship: Drop Ship
+    editing_supplier: Editar proveedor
+    default_commission_flat_rate: Comision por defecto
+    default_commission_percentage: Porcentaje de comision por defecto
+    automatically_deliver_orders_to_supplier: Enviar orden automaticamente a los proveedores
+    send_supplier_email: Enviar correo al proveedor
+    individual: Individual
+    listing_suppliers: Lista de proveedores
+    manage: Gestionar
+    name: Nombre
+    or: ó
+    suppliers: Proveedores
+    listing_shipments: 'Lista de envíos'
+    order_state:
+      active: Activo
+      completed: Completado
+      confirmed: Confirmado
+      delivered: Entregado
+    resend_order_to_supplier: Reenviar orden al proveedor.
+    save: Guardar
+    search: Buscar
+    send_order_to_supplier: Enviar orden al proveedor.
+    show_only_incomplete_orders: Solo mostrar ordenes incompletas
+    supplier: Proveedor
+    supplier_information: Información del proveedor
+    marketplace_order_mailer:
+      supplier_order:
+        hello: "Hola %{name},"
+        subject: "%{name} Orden al proveedor #%{number}"
+        thank_you_again: "Gracias nuevamente por su negocio, <b>%{name}</b>"
+    shared:
+      unauthorized:
+        explained: Usted no está autorizado a acceder a esta página.
+        unauthorized: No autorizado
+    supplier_mailer:
+      welcome:
+        hello: "Hola %{name},"
+        check_your_status: Puede revisar el estado de su pedido por
+        logging_into_your_account: Autentíquese.
+        once_your_request_is_approved: Una vez que su pedido sea aprobado podrá gestionar su inventario.
+        subject: 'Gracias por autenticarse. Por favor verifique la información.'
+        thank_you_again: "Gracias nuevamente por su negocio, <b>%{name}</b>"
+        thank_you_for_signing_up: Gracias por autenticarse para ser un proveedor.
+    suppliers:
+      already_signed_up: "Ya está autenticado para convertirse en un proveedor."
+      create:
+        success: Gracias por autenticarse!
+    supplier_registration:
+      already_signed_up: "Ya inicio sesión como proveedor."
+      create:
+        invalid_password: Clave incorrecta por favor inicie sesion.
+        success: Gracias por registrarse!