solidus_auction 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed967ff89e313e5a77ce9ad7074c006f24a894b87bab2384ed196875e8f66bd1
-  data.tar.gz: d4161f99b72d9b3c01ad202a8f9f7b82216b5f88fc422a6f8e9d9fcff9812eb6
+  metadata.gz: 761923accc9ce42c7154c77cbbece12b5581ed71e7d2ae8dcf3d063c39801415
+  data.tar.gz: c684ceb4c43f4c9263ddb834cc99d1248a356fab79871f73e5039c2ed32e5cc7
 SHA512:
-  metadata.gz: eddeb43728e17fc6d9f3a5928fb1afab5c46e4a895c3ba211f7b139ed9f19883df42dbbd7ddc56e03d380e006cc4ca6764f368aa8f85f44fef413ccfb7f18c84
-  data.tar.gz: e28c54950a8b96150d41d293cf26ae6f2cfb44b642eebd774b62cdae813c9de4bde444e27952541527982ac994ac152157acb43ae5eb0d4d4370a2a5181394fe
+  metadata.gz: e202fef7df5da578fcfef50f50830137126568f20ab1921b9a7b1e3e540a1cf4192e0a379d2dd24e9e96d7bc029bfc0165880f8a55d438332362ebc29c3256ce
+  data.tar.gz: 23fbda34bad7cd37c1bb084589b6f22c9529652325931d52c4fae1a1f29f5ff85e624b235c1ba180c8e529ed5001ca16485238e8fba85730371e3e8386b67cac

data/app/assets/javascripts/spree/backend/solidus_auction.js

@@ -4,4 +4,5 @@
 //= require spree/backend/product_autocomplete
 //= require countdown
 //= require spree/ends_in
+//= require spree/checkout_in
 //= require local-time

data/app/assets/javascripts/spree/checkout_in.js

@@ -0,0 +1,30 @@
+$(document).ready(function() {
+  setInterval(updateCheckoutTimes, 1000);
+});
+
+function updateCheckoutTimes() {
+  var checkoutRemainings = $(".checkout-in")
+  if (checkoutRemainings.length > 0) {
+    $.each(checkoutRemainings, updateCheckoutTime);
+  }
+}
+
+function updateCheckoutTime(_, element) {
+  var $element = $(element);
+  var currentDatetime = new Date();
+  var dateTime = $element.data("auction-checkout-deadline");
+  if (currentDatetime > dateTime) {
+    var pretext = $($element.siblings()[0]);
+    pretext.addClass("green");
+    pretext.html("Complete");
+    $element.remove();
+  } else {
+    var countdownString = countdown(
+      dateTime,
+      null,
+      countdown.DAYS|countdown.HOURS|countdown.MINUTES|countdown.SECONDS,
+      2
+    ).toString();
+  }
+  element.innerHTML = countdownString;
+}

data/app/assets/javascripts/spree/ends_in.js

@@ -14,9 +14,9 @@ function updateTime(_, element) {
   var currentDatetime = new Date();
   var auctionEndDatetime = $element.data("auction-end-datetime");
   if (currentDatetime > auctionEndDatetime) {
-    var pretext = $element.siblings()[0];
+    var pretext = $($element.siblings()[0]);
     pretext.addClass("green");
-    pretext.innerHTML = "Complete";
+    pretext.html("Complete");
     $element.remove();
   } else {
     var countdownString = countdown(

data/app/assets/javascripts/spree/frontend/solidus_auction.js

@@ -5,4 +5,5 @@
 //= require countdown
 //= require spree/ends_in
 //= require spree/frontend/starts_in
+//= require spree/checkout_in
 //= require spree/frontend/votes

data/app/controllers/spree/admin/auctions_controller.rb

@@ -37,7 +37,7 @@ class Spree::Admin::AuctionsController < Spree::Admin::ResourceController
   end
 
   def permitted_auction_attributes
-    %i{id title description starting_datetime planned_end_datetime starting_price reserve_price bid_increment time_increment countdown product_id}
+    %i{id title description starting_datetime planned_end_datetime starting_price reserve_price bid_increment time_increment countdown product_id checkout_time_minutes}
   end
 
   def permitted_resource_params

data/app/models/spree/auction.rb

@@ -8,6 +8,7 @@ class Spree::Auction < Spree::Base
   before_save :init_current_price, if: :new_record?
   before_save :set_current_end_datetime
   after_find :set_complete
+  after_find :check_for_deadline
 
   validates :title, presence: true
   validates :description, presence: true
@@ -51,8 +52,14 @@ class Spree::Auction < Spree::Base
     current_price >= reserve_price
   end
 
+  def order_complete?
+    if order
+      order.complete?
+    end
+  end
+
   def won?
-    complete && reserve_met? && highest_bidder
+    true if complete && reserve_met? && highest_bidder
   end
 
   def started?
@@ -62,7 +69,9 @@ class Spree::Auction < Spree::Base
   end
 
   def order
-    variant.orders.first
+    if variant
+      variant.orders.first
+    end
   end
 
   def in_progress?
@@ -70,7 +79,15 @@ class Spree::Auction < Spree::Base
   end
 
   def visible_bids
-    bids.where(visible: true)
+    bids.visible
+  end
+
+  def checkout_deadline
+    current_end_datetime + checkout_time_minutes.minutes
+  end
+
+  def checkout_deadline_not_met?
+    Time.now > checkout_deadline
   end
 
   def visible_bids_in_chron_order
@@ -85,22 +102,34 @@ class Spree::Auction < Spree::Base
     current_end_datetime.to_f * 1000
   end
 
+  def checkout_deadline_as_float
+    checkout_deadline.to_f * 1000
+  end
+
   def starting_datetime_as_float
     starting_datetime.to_f * 1000
   end
 
   def accepted_bids
-    bids.where(accepted: true)
+    bids.accepted
   end
 
   def accepted_bids_in_order
     accepted_bids.order("amount DESC")
   end
 
+  def accepted_not_delinquent_bids_in_order
+    accepted_bids.not_delinquent.order("amount DESC")
+  end
+
   def highest_bid
     accepted_bids_in_order.first
   end
 
+  def highest_bidder_bids
+    highest_bidder.bids.where(auction_id: id)
+  end
+
   def second_highest_bid
     accepted_bids_in_order.second
   end
@@ -148,6 +177,28 @@ class Spree::Auction < Spree::Base
     end
   end
 
+  def check_for_deadline
+    if won? && checkout_deadline_not_met? && !order_complete?
+      highest_bidder_bids.update_all(delinquent: true)
+      highest_bidder_order = highest_bidder.last_incomplete_spree_order
+      if highest_bidder_order
+        highest_bidder_order.contents.remove(variant, 1)
+      end
+
+      bid = accepted_not_delinquent_bids_in_order.first
+      if bid
+        self.highest_bidder = bid.bidder
+        self.current_price = bid.amount
+        self.current_end_datetime = checkout_deadline
+        save
+        add_winning_item_to_highest_bidder_cart
+      else
+        self.highest_bidder_id = nil
+        save
+      end
+    end
+  end
+
   def add_winning_item_to_highest_bidder_cart
     user = highest_bidder
     cart = get_user_cart(user)

data/app/models/spree/bid.rb

@@ -9,6 +9,11 @@ class Spree::Bid < Spree::Base
   extend Spree::DisplayMoney
   money_methods :amount
 
+  scope :accepted, -> { where(accepted: true) }
+  scope :visible, -> { where(visible: true) }
+  scope :delinquent, -> { where(delinquent: true) }
+  scope :not_delinquent, -> { where(delinquent: false) }
+
   def is_autobid?
     !visible && accepted
   end

data/app/overrides/add_auction_links_to_order_info.rb

@@ -1,6 +1,6 @@
 Deface::Override.new(
   virtual_path: 'spree/admin/shared/_order_summary',
   name: :auction_links_to_order_info,
-  insert_bottom: "[data-hook='admin_settings_sub_tabs']",
+  insert_bottom: ".additional-info",
   partial: 'spree/admin/shared/auction_links_to_order_info'
 )

data/app/views/spree/admin/auctions/_form.html.erb

@@ -88,7 +88,7 @@
           <%= f.field_container :countdown do %>
             <%= f.label :countdown, Spree.t("countdown_seconds")  %>
             <%= f.field_hint :countdown %>
-              <%= f.number_field :countdown, disable_on_complete(auction_complete, {in: seconds_limit})  %>
+            <%= f.number_field :countdown, disable_on_complete(auction_complete, {in: seconds_limit})  %>
             <%= f.error_message_on :countdown %>
           <% end %>
         </div>
@@ -101,6 +101,17 @@
             <%= f.error_message_on :time_increment %>
           <% end %>
         </div>
+
+        <% minutes_limit = 1..10080 %>
+        <div data-hook="admin_auction_form_checkout_time_minutes" class="left col-6">
+          <%= f.field_container :checkout_time_minutes do %>
+
+            <%= f.label :checkout_time_minutes%>
+            <%= f.field_hint :checkout_time_minutes%>
+            <%= f.number_field :checkout_time_minutes, disable_on_complete(auction_complete, {in: minutes_limit})  %>
+            <%= f.error_message_on :checkout_time_minutes%>
+          <% end %>
+        </div>
       </div>
     </div>
 
@@ -121,7 +132,6 @@
       <% if !@auction.complete && auction.started? %>
         <div data-hook="admin_auction_form_time_remaining">
           <%= f.field_container :current_end_datetime do %>
-            <label for="current_end_datetime"><%= Spree.t("ends_in") %></label>
             <p class="fullwidth title">
               <%= render partial: 'spree/shared/ends_in', locals: { auction: @auction } %>
             </p>
@@ -129,7 +139,7 @@
         </div>
       <% end %>
 
-      <div class="clear"></div>
+
       <% if @auction.current_end_datetime %>
         <div data-hook="admin_auction_form_available_on">
           <%= f.field_container :current_end_datetime do %>
@@ -141,7 +151,32 @@
           <% end %>
         </div>
       <% end %>
+      <div class="clear"></div>
+
+      <% if @auction.current_end_datetime %>
+        <div data-hook="admin_auction_form_available_on">
+          <%= f.field_container :current_end_datetime do %>
+            <div class="field" id="auction_checkout_deadline">
+              <label for="checkout_deadline_date"><%= Spree.t("checkout_deadline") %></label>
+              <p class="fullwidth title">
+                <%= local_time @auction.checkout_deadline %>
+              </p>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+
+      <% if auction.won? && !auction.order_complete? %>
+        <div data-hook="admin_auction_form_checkout_deadline">
+          <%= f.field_container :current_end_datetime do %>
+            <p class="fullwidth title">
+              <%= render partial: 'spree/shared/checkout_in', locals: { auction: @auction } %>
+            </p>
+          <% end %>
+        </div>
+      <% end %>
 
+      <div class="clear"></div>
       <div class="clear"></div>
 
       <% if highest_bidder = auction.highest_bidder %>

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

@@ -31,7 +31,7 @@
           <th><%= Spree.t("bids") %></th>
           <th><%= Spree.t("starting_datetime") %></th>
           <th><%= Spree.t("current_end_datetime") %></th>
-          <th><%= Spree.t("ends_in") %></th>
+          <th><%= Spree.t("time_remaining") %></th>
           <th></th>
         </tr>
       </thead>
@@ -57,12 +57,18 @@
             <td><%= local_time(auction.starting_datetime) %></td>
             <td><%= local_time(auction.current_end_datetime) %></td>
             <td>
-              <% if auction.complete %>
+              <% if auction.order_complete? %>
                 <span class="pill pill-complete">
                   <%= Spree.t("complete") %>
                 </span>
-              <% elsif auction.started? %>
+              <% elsif auction.won? && !auction.order_complete? %>
+                <%= render partial: 'spree/shared/checkout_in', locals: { auction: auction } %>
+              <% elsif !auction.complete && auction.started? %>
                 <%= render partial: 'spree/shared/ends_in', locals: { auction: auction } %>
+              <% elsif auction.complete && auction.highest_bidder.nil? %>
+                <span class="pill pill-pending">
+                  <%= Spree.t("no_highest_bidder") %>
+                </span>
               <% else %>
                 <span class="pill pill-pending">
                   <%= Spree.t("waiting_to_start") %>

data/app/views/spree/auctions/_bid_form.html.erb

@@ -41,32 +41,34 @@
           </span>
         </div>
         <%= render partial: 'spree/shared/votes', locals: { auction: @auction } %>
-        <div>
-          <span>
-            <%= t("spree.min_bid") %>:
-          </span>
-          <span>
-            <%= number_to_currency(min_bid, :unit => "$") %>
-          </span>
-        </div>
+        <% if !@auction.complete %>
+          <div>
+            <span>
+              <%= t("spree.min_bid") %>:
+            </span>
+            <span>
+              <%= number_to_currency(min_bid, :unit => "$") %>
+            </span>
+          </div>
+        <% end %>
       </div>
       <% if spree_current_user %>
-        <% highest_bidder = @auction.highest_bidder_id == spree_current_user.id %>
+        <% is_highest_bidder = @auction.highest_bidder_id == spree_current_user.id %>
       <% else %>
-        <% highest_bidder = false %>
+        <% is_highest_bidder = false %>
       <% end %>
       <% if @auction.complete %>
-        <% if highest_bidder  %>
+        <% if is_highest_bidder  %>
           <h6 class="product-section-title green">
             <%= Spree.t("you_have_won_this_auction") %>
           </h6>
+          <%= render partial: 'spree/shared/checkout_in', locals: { auction: @auction } %>
           <h6 class="product-section-title">
             <%= Spree.t("view_order_or_checkout") %>:
           </h6>
           <%= render partial: 'spree/shared/auction_order_link', locals: { auction: @auction } %>
         <% end %>
       <% else %>
-
         <%= hidden_field_tag :auction_id, @auction.id %>
         <div class="add-to-cart">
           <%= number_field_tag :amount, min_bid, class: 'title', min: min_bid, step: 0.01, disabled: !@auction.in_progress? %>

data/app/views/spree/shared/_auctions_table_show.html.erb

@@ -54,12 +54,19 @@
               </td>
               <td><%= local_time(auction.current_end_datetime) %></td>
               <td>
-                <% if auction.complete %>
+                <% is_highest_bidder = auction.highest_bidder_id == spree_current_user.id %>
+                <% if is_highest_bidder && auction.order_complete? %>
                   <span class="green">
                     <%= Spree.t("complete") %>
                   </span>
+                <% elsif is_highest_bidder && auction.won? && !auction.order_complete? %>
+                  <%= render partial: 'spree/shared/checkout_in', locals: { auction: auction } %>
                 <% elsif auction.in_progress? %>
                   <%= render partial: 'spree/shared/ends_in', locals: { auction: auction } %>
+                <% elsif auction.complete? %>
+                  <span class="green">
+                    <%= Spree.t("complete") %>
+                  </span>
                 <% end %>
               </td>
               <td>

data/app/views/spree/shared/_checkout_in.html.erb

@@ -0,0 +1,18 @@
+<% if auction.won? && !auction.order_complete? %>
+  <% if auction.current_end_datetime %>
+    <span>
+      <%= Spree.t("checkout_in") %>
+    </span>
+    <span class="checkout-in red" data-auction-checkout-deadline=<%= auction.checkout_deadline_as_float %> >
+      <% if auction.won? %>
+        <% if auction.order_complete? %>
+          <span class="green">
+            <%= Spree.t("payment_complete") %>
+          </span>
+        <% else %>
+          <%= distance_of_time_in_words_to_now(auction.checkout_deadline) %>
+        <% end %>
+      <% end %>
+    </span>
+  <% end %>
+<% end %>

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

@@ -16,7 +16,11 @@
   <td class="cart-item-description" data-hook="cart_item_description">
     <h4><%= link_to auction.title, auction %></h4>
     <span class="line-item-description" data-hook="line_item_description">
-      <%= auction.description %>
+      <%= line_item_description_text(auction.description) %>
+    </span>
+    &nbsp;<br />
+    <span class="line-item-description" data-hook="line_item_checkout_deadline">
+      <%= render partial: 'spree/shared/checkout_in', locals: { auction: auction } %>
     </span>
   </td>
 <% end %>

data/config/locales/en.yml

@@ -15,6 +15,10 @@ en:
     starting_soon_hours: Starting Soon Hours
     ending_soon: Ending Soon
     ending_soon_hours: Ending Soon Hours
+    payment_complete: Payment Complete
+    checkout_in: Must checkout in
+    no_highest_bidder: No highest bidder
+    checkout_deadline: Checkout Deadline
     recently_completed: Recently Completed
     recently_completed_hours: Recently Completed Hours
     number_of_bids_to_show: Number of bids to show
@@ -52,6 +56,7 @@ en:
     complete: Complete
     auctions: Auctions
     ends_in: Ends in
+    time_remaining: Time Remaining
     ends_at: Ends at
     starting_datetime: Start
     current_end_datetime: End
@@ -74,3 +79,4 @@ en:
         bid_increment: When a bidder bids, they have to bid the current price + this amount in order to succesfully bid. For example, if the current price is $25.00 and bid increment is $2.50, the next successful bidder must bid $27.50 or more.
         time_increment: Number of seconds to increase the end of the auction when within countdown.
         end: This is different from "Planned End" because the "countdown" and "time increment" can change the originally chosen date and time.
+        checkout_time_minutes: The amount of time the successful bidder has to make payment on your auction. Default is 1 day (1440 minutes) and maximum is 1 week (10080 minutes). Make it as urgent as you want.

data/db/migrate/20180415163201_add_checkout_time_minutes_to_spree_auctions.rb

@@ -0,0 +1,5 @@
+class AddCheckoutTimeMinutesToSpreeAuctions < ActiveRecord::Migration[5.1]
+  def change
+    add_column :spree_auctions, :checkout_time_minutes, :integer, default: 1440
+  end
+end

data/db/migrate/20180417180042_add_delinquent_to_spree_bids.rb

@@ -0,0 +1,5 @@
+class AddDelinquentToSpreeBids < ActiveRecord::Migration[5.1]
+  def change
+    add_column :spree_bids, :delinquent, :boolean, default: false
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auction
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Jeffrey Gu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -249,6 +249,7 @@ files:
 - app/assets/javascripts/local-time.js
 - app/assets/javascripts/spree/backend/product_autocomplete.js
 - app/assets/javascripts/spree/backend/solidus_auction.js
+- app/assets/javascripts/spree/checkout_in.js
 - app/assets/javascripts/spree/ends_in.js
 - app/assets/javascripts/spree/frontend/solidus_auction.js
 - app/assets/javascripts/spree/frontend/starts_in.js
@@ -317,6 +318,7 @@ files:
 - app/views/spree/shared/_auctions.html.erb
 - app/views/spree/shared/_auctions_link.html.erb
 - app/views/spree/shared/_auctions_table_show.html.erb
+- app/views/spree/shared/_checkout_in.html.erb
 - app/views/spree/shared/_ends_in.html.erb
 - app/views/spree/shared/_image.html.erb
 - app/views/spree/shared/_line_item_delete.html.erb
@@ -341,6 +343,8 @@ files:
 - db/migrate/20180328233438_add_variant_id_to_auction.rb
 - db/migrate/20180410025053_acts_as_votable_migration.rb
 - db/migrate/20180410031333_add_cached_votes_to_spree_auctions.rb
+- db/migrate/20180415163201_add_checkout_time_minutes_to_spree_auctions.rb
+- db/migrate/20180417180042_add_delinquent_to_spree_bids.rb
 - lib/assets/javascripts/src/local-time/calendar_date.coffee
 - lib/assets/javascripts/src/local-time/config/i18n.coffee
 - lib/assets/javascripts/src/local-time/config/locale.coffee
@@ -361,7 +365,7 @@ files:
 - lib/solidus_auction/engine.rb
 - lib/solidus_auction/factories.rb
 - lib/solidus_auction/version.rb
-homepage: https://jeffreygu.com
+homepage: https://github.com/jgujgu/solidus_auction
 licenses:
 - BSD-3-Clause
 metadata: {}