Remove "Free Shipping" Banner (GoogleCloudPlatform#800)

charlieyu1996 · web-flow · commit 6bbe8cc40573 · 2022-04-19T11:24:03.000-04:00
* testing shipping quote

* removed navbar from header

* removed css for navbar

* removed shipping fee returning 0

* test to check if we can obtain the price

* removed logic that counts the number of items in the cart

* set count variable back to int

* Removed quoteByCountFloat since it does not need to calculate the items and shipping fee

* comment change to numbering in GetQuote
diff --git a/src/frontend/static/styles/styles.css b/src/frontend/static/styles/styles.css
@@ -71,11 +71,6 @@ header .cart-size-circle {
   background-color: #853B5C;
 }
 
-header .navbar {
-  padding-top: 5px;
-  padding-bottom: 5px;
-}
-
 header .h-free-shipping {
   font-size: 14px;
 }
diff --git a/src/frontend/templates/header.html b/src/frontend/templates/header.html
@@ -46,11 +46,6 @@
 
 <body>
     <header>
-        <div class="navbar">
-            <div class="container d-flex justify-content-center">
-                <div class="h-free-shipping">Free shipping with $75 purchase!</div>
-            </div>
-        </div>
         <div class="navbar sub-navbar">
             <div class="container d-flex justify-content-between">
                 <a href="/" class="navbar-brand d-flex align-items-center">
diff --git a/src/shippingservice/main.go b/src/shippingservice/main.go
@@ -120,16 +120,10 @@ func (s *server) GetQuote(ctx context.Context, in *pb.GetQuoteRequest) (*pb.GetQ
 	log.Info("[GetQuote] received request")
 	defer log.Info("[GetQuote] completed request")
 
-	// 1. Our quote system requires the total number of items to be shipped.
-	count := 0
-	for _, item := range in.Items {
-		count += int(item.Quantity)
-	}
-
-	// 2. Generate a quote based on the total number of items to be shipped.
-	quote := CreateQuoteFromCount(count)
+	// 1. Generate a quote based on the total number of items to be shipped.
+	quote := CreateQuoteFromCount(0)
 
-	// 3. Generate a response.
+	// 2. Generate a response.
 	return &pb.GetQuoteResponse{
 		CostUsd: &pb.Money{
 			CurrencyCode: "USD",
diff --git a/src/shippingservice/quote.go b/src/shippingservice/quote.go
@@ -32,7 +32,7 @@ func (q Quote) String() string {
 
 // CreateQuoteFromCount takes a number of items and returns a Price struct.
 func CreateQuoteFromCount(count int) Quote {
-	return CreateQuoteFromFloat(quoteByCountFloat(count))
+	return CreateQuoteFromFloat(8.99)
 }
 
 // CreateQuoteFromFloat takes a price represented as a float and creates a Price struct.
@@ -42,12 +42,4 @@ func CreateQuoteFromFloat(value float64) Quote {
 		uint32(units),
 		uint32(math.Trunc(fraction * 100)),
 	}
-}
-
-// quoteByCountFloat takes a number of items and generates a price quote represented as a float.
-func quoteByCountFloat(count int) float64 {
-	if count == 0 {
-		return 0
-	}
-	return 8.99
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,6 @@ header .cart-size-circle {`
`71`	`71`	`background-color: #853B5C;`
`72`	`72`	`}`
`73`	`73`
`74`		`-header .navbar {`
`75`		`- padding-top: 5px;`
`76`		`- padding-bottom: 5px;`
`77`		`-}`
`78`		`-`
`79`	`74`	`header .h-free-shipping {`
`80`	`75`	`font-size: 14px;`
`81`	`76`	`}`