Merge to Main

app/controllers/admin/invoices_controller.rb

@@ -0,0 +1,10 @@
+class Admin::InvoicesController < ApplicationController
+
+  def index
+
+  end
+
+  def show
+
+  end
+end

app/controllers/admin/merchants_controller.rb

@@ -0,0 +1,10 @@
+class Admin::MerchantsController < ApplicationController
+
+  def index
+    @merchants = Merchant.all
+  end
+
+  def show
+    @merchant = Merchant.find(params[:id])
+  end
+end

app/controllers/admin_controller.rb

@@ -0,0 +1,7 @@
+class AdminController < ApplicationController
+
+  def index
+    @invoices = Invoice.all
+    @customers = Customer.all
+  end
+end

app/controllers/invoices_controller.rb

@@ -2,10 +2,23 @@ class InvoicesController < ApplicationController
   before_action :find_merchant
 
   def index
-    @invoices = @merchant.invoices
+    @invoices = Invoice.invoices_with_merchant_items(@merchant)
   end
 
   def show
     @invoice = Invoice.find(params[:id])
   end
+
+
+  def update
+    invoice = Invoice.find(params[:id])
+    invoice_item = InvoiceItem.find(params[:invoice_item_id])
+    invoice_item.update(invoice_item_params)
+    redirect_to merchant_invoice_path(@merchant, invoice)
+  end
+
+  private
+    def invoice_item_params
+      params.permit(:status)
+    end
 end

app/models/customer.rb

@@ -7,6 +7,8 @@ class Customer < ApplicationRecord
 
   validates_presence_of :first_name, :last_name
 
+  # TODO: refactor these methods they are basically the same
+
   def self.favorite_customers(count)
     joins(invoices: :transactions).
     where(transactions: {result: true}).
@@ -18,4 +20,12 @@ def self.favorite_customers(count)
   def self.count_successful_transactions(id)
     Customer.find(id).transactions.where(result: true).count
   end
+
+  def self.top_customers
+    joins(invoices: :transactions)
+    .where(transactions: {result: true})
+    .group(:id).select("customers.*, COUNT(transactions) AS transaction_count")
+    .order("transaction_count desc")
+    .limit(5)
+  end
 end

app/models/invoice.rb

@@ -16,4 +16,15 @@ def invoice_customer
   def total_revenue
     invoice_items.sum('invoice_items.unit_price * invoice_items.quantity')
   end
+
+  def self.incomplete_invoices
+    joins(:invoice_items)
+    .where.not(invoice_items: {status: 1})
+    .distinct
+    .order(:created_at)
+  end
+
+  def self.invoices_with_merchant_items(merchant)
+    merchant.invoices.distinct(:id)
+  end
 end

app/models/item.rb

@@ -7,4 +7,15 @@ class Item < ApplicationRecord
   validates_presence_of :name, :description, :unit_price
 
   enum status: { 'disabled' => 0, 'enabled' => 1 }
+
+  def best_sales_date
+    invoices
+    .joins(:invoice_items)
+    .select("invoices.*, MAX(invoice_items.quantity) AS most_sold")
+    .group(:id)
+    .order(most_sold: :desc)
+    .first
+    .created_at
+    .strftime("%a, %d %b %Y")
+  end
 end

app/models/merchant.rb

@@ -7,6 +7,13 @@ class Merchant < ApplicationRecord
 
   validates :name, presence: true
 
+  def items_ready_to_ship
+    Merchant.joins(invoice_items: [invoice: :transactions]).
+    where(merchants: {id: self.id}, invoice_items: {status: [0,2]}, invoices: {status: [1,2]}, transactions: {result: true}).
+    select("items.name, invoices.id, invoices.created_at").
+    order("invoices.created_at ASC")
+  end
+
   def top_five_items
     items
     .joins(invoice_items: [invoice: :transactions])
@@ -16,11 +23,4 @@ def top_five_items
     .order('revenue desc')
     .limit(5)
   end
-
-  def items_ready_to_ship
-    Merchant.joins(invoice_items: [invoice: :transactions]).
-    where(merchants: {id: self.id}, invoice_items: {status: [0,2]}, invoices: {status: [1,2]}, transactions: {result: true}).
-    select("items.name, invoices.id, invoices.created_at").
-    order("invoices.created_at ASC")
-  end
 end

app/views/admin/index.html.erb

@@ -0,0 +1,27 @@
+<%= render 'partials/navbar_admin' %>
+<%= render 'partials/two_columns' %>
+
+<div class="row">
+  <div class="column";>
+    <div class ="incomplete-invoices">
+      <h3 style="text-align:center;"> Incomplete Invoices </h3>
+      <hr><br>
+      <ul><% @invoices.incomplete_invoices.each do |invoice| %>
+        <li> <%= link_to "#{invoice.id}", admin_invoice_path(invoice) %> <i>Created on: <%= invoice.created_at.strftime("%A, %d %b %Y") %> </i></li>
+    <% end %></ul>
+    </div>
+  </div>
+
+
+  <div class="column">
+    <div class="top-five-customers">
+      <h3 style="text-align:center;">Top Customers</h3>
+      <hr><br>
+      <ol>
+        <% @customers.top_customers.each do |customer| %>
+        <h5><li><%= "#{customer.first_name} #{customer.last_name}" %> - <%= customer.transaction_count %> purchases</li></h5><br>
+        <% end %>
+      </ol>
+    </div>
+  </div>
+</div>

app/views/admin/merchants/index.html.erb

@@ -0,0 +1,7 @@
+<h1>Admin Merchants Index</h1>
+
+<div class="merchant_index">
+  <ul><% @merchants.each do |merchant| %>
+    <li><%= merchant.name %></li>
+  <% end %></ul>
+</div>

app/views/admin/merchants/show.html.erb

@@ -0,0 +1 @@
+<h1><%= @merchant.name %>'s Admin Page</h1>

app/views/invoices/show.html.erb

@@ -8,12 +8,19 @@
 <h2>Invoice Items</h2>
 <div class="invoice_items">
   <% @invoice.invoice_items.each do |invoice_item| %>
+  <div id="<%= invoice_item.id %>">
     <h4>Item Name: <%= invoice_item.item.name %></h4>
     <p>Quantity Sold: <%= invoice_item.quantity %></p>
     <p>Sold at: <%= number_to_currency(invoice_item.unit_price) %></p>
     <p>Invoice Item Status: <%= invoice_item.status.titleize %></p>
-    <hr>
+      <%= form_with url: merchant_invoice_path(@merchant, @invoice), method: :patch do |form| %>
+        <%= form.select :status, ['pending', 'shipped', 'packaged'], selected: invoice_item.status %>
+        <%= hidden_field_tag "invoice_item_id", "#{invoice_item.id}" %>
+        <%= form.submit "Update Invoice Item Status" %>
+      <% end %>
+  </div>
+  <hr>
   <% end %>
 </div>
 
-Total Revenue: <%= number_to_currency(@invoice.total_revenue) %>
+<p><b>Total Revenue:</b> <%= number_to_currency(@invoice.total_revenue) %></p>

app/views/items/index.html.erb

@@ -16,7 +16,6 @@
   <% end %></ul>
 </div>
 
-
 <div class="disabled-items">
   <h3>Status: Disabled</h3>
   <ul><% @items.each do |item| %>
@@ -30,12 +29,12 @@
   <% end %></ul>
 </div>
 
-
 <div class="top-5">
   <h3> Top Five Most Popular Items: </h3>
     <ol>
       <% @merchant.top_five_items.each do |item| %>
         <li> <%= link_to "#{item.name}", merchant_item_path(@merchant, item) %> <i>Total Revenue: <%= number_to_currency(item.revenue) %></i></li>
+          <p>Top selling date for <%= item.name %> was <%= item.best_sales_date %></p>
       <% end %>
     </ol>
 </div>

app/views/layouts/application.html.erb

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <%= render 'partials/jumbotron' %>
     <title>LittleEtsyShop</title>
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
@@ -10,7 +11,6 @@
   </head>
 
   <body>
-
     <% flash.each do |type, msg| %>
     <div>
       <h3 style= "color:orange">  <%= msg %> </h3>

app/views/partials/_jumbotron.html.erb

@@ -0,0 +1,26 @@
+<div class="jumbotron jumbotron-fluid">
+  <div class="container">
+    <h1 class="display-4" style="text-align:center;">Little Esty Shop</h1>
+    <!-- <p class="lead">This is a modified jumbotron that occupies the entire horizontal space of its parent.</p> -->
+  </div>
+</div>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <title>Bootstrap Navbar Sidebar - Fixed to Left or Right</title>
+    <link rel="stylesheet"
+          id="theme_link"
+          href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/4.3.1/materia/bootstrap.min.css"/>
+    <link rel="stylesheet" href="navbar-fixed-right.min.css">
+    <link rel="stylesheet" href="navbar-fixed-left.min.css">
+    <link rel="stylesheet" href="docs.css">
+    <script
+            src="https://code.jquery.com/jquery-3.4.1.slim.min.js"
+            integrity="sha256-pasqAKBDmFT4eHoN2ndd6lN370kFiGUFyTiUHWhU7k8="
+            crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
+            integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
+            crossorigin="anonymous"></script>
+    <script src="docs.js"></script>
+    <script async defer src="https://buttons.github.io/buttons.js"></script>
+</head>

app/views/partials/_navbar_admin.html.erb

@@ -0,0 +1,12 @@
+<nav class="navbar navbar-expand-lg navbar-light bg-light">
+  <a class="navbar-brand" href="#">Welcome to the Admin Dashboard</a>
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+  <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
+    <div class="navbar-nav">
+      <a class="nav-item nav-link" href="/admin/merchants">Merchants Index</a>
+      <a class="nav-item nav-link" href="/admin/invoices">Invoices Index</a>
+    </div>
+  </div>
+</nav>

app/views/partials/_two_columns.html.erb

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<style>
+* {
+  box-sizing: border-box;
+}
+
+/* Create two equal columns that floats next to each other */
+.column {
+  float: center;
+  width: 50%;
+  padding: 10%;
+  <!-- border: 1px solid black; -->
+}
+
+/* Clear floats after the columns */
+.row:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+</style>
+</head>
+<body>

config/routes.rb

@@ -3,10 +3,13 @@
 
   resources :merchants, except: [:show] do
     resources :items, only: [:index, :show, :edit, :update, :new, :create]
-    resources :invoices, only: [:index, :show]
+    resources :invoices, only: [:index, :show, :update]
   end
 
+  resources :admin, only: [:index]
+
   namespace :admin do
-    resources :merchants
+    resources :merchants, only: [:index, :show]
+    resources :invoices, only: [:index, :show]
   end
 end