merge with master
This commit is contained in:
5
app/controllers/oqs/print_controller.rb
Normal file
5
app/controllers/oqs/print_controller.rb
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
class Oqs::PrintController < ApplicationController
|
||||||
|
def print
|
||||||
|
|
||||||
|
end
|
||||||
|
end
|
||||||
2
app/helpers/oqs/print_helper.rb
Normal file
2
app/helpers/oqs/print_helper.rb
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
module Oqs::PrintHelper
|
||||||
|
end
|
||||||
@@ -197,7 +197,7 @@
|
|||||||
<!-- Column Three--->
|
<!-- Column Three--->
|
||||||
<div class="col-lg-1 col-md-1 col-sm-1">
|
<div class="col-lg-1 col-md-1 col-sm-1">
|
||||||
<!-- OQS Buttons -->
|
<!-- OQS Buttons -->
|
||||||
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print</button>
|
<a href=<%= oqs_print_path %> title="Print Order Item" class="btn btn-primary btn-lg btn-block">Print</a>
|
||||||
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print <br/>Order<br/>Summary</button>
|
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Print <br/>Order<br/>Summary</button>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
2
app/views/oqs/print/print.html.erb
Normal file
2
app/views/oqs/print/print.html.erb
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
<h1>Oqs::Print#print</h1>
|
||||||
|
<p>Find me in app/views/oqs/print/print.html.erb</p>
|
||||||
@@ -99,6 +99,8 @@ Rails.application.routes.draw do
|
|||||||
root "home#index"
|
root "home#index"
|
||||||
|
|
||||||
post 'update_delivery', to: "home#update_delivery_status"
|
post 'update_delivery', to: "home#update_delivery_status"
|
||||||
|
|
||||||
|
get 'print/print'
|
||||||
#dashboard
|
#dashboard
|
||||||
#
|
#
|
||||||
end
|
end
|
||||||
|
|||||||
12
spec/controllers/oqs/print_controller_spec.rb
Normal file
12
spec/controllers/oqs/print_controller_spec.rb
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Oqs::PrintController, type: :controller do
|
||||||
|
|
||||||
|
describe "GET #print" do
|
||||||
|
it "returns http success" do
|
||||||
|
get :print
|
||||||
|
expect(response).to have_http_status(:success)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
15
spec/helpers/oqs/print_helper_spec.rb
Normal file
15
spec/helpers/oqs/print_helper_spec.rb
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
# Specs in this file have access to a helper object that includes
|
||||||
|
# the Oqs::PrintHelper. For example:
|
||||||
|
#
|
||||||
|
# describe Oqs::PrintHelper do
|
||||||
|
# describe "string concat" do
|
||||||
|
# it "concats two strings with spaces" do
|
||||||
|
# expect(helper.concat_strings("this","that")).to eq("this that")
|
||||||
|
# end
|
||||||
|
# end
|
||||||
|
# end
|
||||||
|
RSpec.describe Oqs::PrintHelper, type: :helper do
|
||||||
|
pending "add some examples to (or delete) #{__FILE__}"
|
||||||
|
end
|
||||||
5
spec/views/oqs/print/print.html.erb_spec.rb
Normal file
5
spec/views/oqs/print/print.html.erb_spec.rb
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe "print/print.html.erb", type: :view do
|
||||||
|
pending "add some examples to (or delete) #{__FILE__}"
|
||||||
|
end
|
||||||
Reference in New Issue
Block a user