Potential fix for gnikyt#175

Author: gnikyt

src/ShopifyApp/Services/BillingPlan.php

@@ -190,13 +190,14 @@ public function save()
 
         // Create a charge
         $charge = Charge::firstOrNew([
-            'type'      => $this->plan->type,
-            'plan_id'   => $this->plan->id,
-            'shop_id'   => $this->shop->id,
             'charge_id' => $this->chargeId,
-            'status'    => $this->response->status,
+            'shop_id'   => $this->shop->id,
         ]);
 
+        $charge->plan_id = $this->plan->id;
+        $charge->type = $this->plan->type;
+        $charge->status = $this->response->status;
+
         if ($this->plan->isType(Plan::PLAN_RECURRING)) {
             // Recurring plan specifics
             $charge->billing_on = $this->response->billing_on;

tests/Middleware/AuthShopMiddlewareTest.php

@@ -90,7 +90,7 @@ public function testHeadersForEsdkShouldBeAdjusted()
         Session::put('shopify_domain', $shop->shopify_domain);
 
         // Run the middleware
-        $result = $this->runAuthShop(null, Request::instance());
+        $result = $this->runAuthShop();
 
         // Assert the headers were modified
         $this->assertEquals('CP="Not used"', $result[0]->headers->get('p3p'));
@@ -141,7 +141,7 @@ public function testHeadersForDisabledEsdk()
         Config::set('shopify-app.esdk_enabled', false);
 
         // Run the middleware
-        $result = $this->runAuthShop(null, Request::instance());
+        $result = $this->runAuthShop();
 
         // Assert the headers were not modified
         $this->assertNull($result[0]->headers->get('p3p'));