Merge pull request laravel#299 from Francismori7/6.0

Dates improved
mattastica · Jun 1, 2016 · 9047692 · 9047692
2 parents 9cf65cd + 07f8a57
commit 9047692
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/resources/views/receipt.blade.php b/resources/views/receipt.blade.php
@@ -137,7 +137,10 @@
                     @foreach ($invoice->subscriptions() as $subscription)
                         <tr>
                             <td>Subscription ({{ $subscription->quantity }})</td>
-                            <td>{{ $subscription->startDate() }} - {{ $subscription->endDate() }}</td>
+                            <td>
+                                {{ $subscription->startDateAsCarbon()->formatLocalized('%B %e, %Y') }} -
+                                {{ $subscription->endDateAsCarbon()->formatLocalized('%B %e, %Y') }}
+                            </td>
                             <td>{{ $subscription->total() }}</td>
                         </tr>
                     @endforeach

diff --git a/src/Invoice.php b/src/Invoice.php
@@ -45,7 +45,7 @@ public function __construct($user, StripeInvoice $invoice)
      */
     public function date($timezone = null)
     {
-        $carbon = Carbon::createFromTimestamp($this->invoice->date);
+        $carbon = Carbon::createFromTimestampUTC($this->invoice->date);
 
         return $timezone ? $carbon->setTimezone($timezone) : $carbon;
     }

diff --git a/src/InvoiceItem.php b/src/InvoiceItem.php
@@ -2,6 +2,8 @@
 
 namespace Laravel\Cashier;
 
+use Carbon\Carbon;
+
 class InvoiceItem
 {
     /**
@@ -49,7 +51,7 @@ public function total()
     public function startDate()
     {
         if ($this->isSubscription()) {
-            return date('M j, Y', $this->item->period->start);
+            return $this->startDateAsCarbon()->toFormattedDateString();
         }
     }
 
@@ -61,7 +63,31 @@ public function startDate()
     public function endDate()
     {
         if ($this->isSubscription()) {
-            return date('M j, Y', $this->item->period->end);
+            return $this->endDateAsCarbon()->toFormattedDateString();
+        }
+    }
+
+    /**
+     * Get a Carbon instance for the start date.
+     *
+     * @return \Carbon\Carbon
+     */
+    public function startDateAsCarbon()
+    {
+        if ($this->isSubscription()) {
+            return Carbon::createFromTimestampUTC($this->item->period->start);
+        }
+    }
+
+    /**
+     * Get a Carbon instance for the end date.
+     *
+     * @return \Carbon\Carbon
+     */
+    public function endDateAsCarbon()
+    {
+        if ($this->isSubscription()) {
+            return Carbon::createFromTimestampUTC($this->item->period->end);
         }
     }