From 953ec5ff17ed4e4570caf4856b18cbeeb29089f1 Mon Sep 17 00:00:00 2001 From: Matt Lantz Date: Mon, 3 Sep 2018 13:41:26 -0400 Subject: [PATCH] UI fixes --- LICENSE.md | 2 +- .../analytics/subscription-table.blade.php | 8 +- src/Views/orders/item.blade.php | 163 +++++++++--------- src/Views/transactions/edit.blade.php | 2 +- 4 files changed, 88 insertions(+), 87 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 7476490..1d49669 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,5 +1,5 @@ The MIT License (MIT) -Copyright (c) YAB Inc. +Copyright (c) Grafite Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/src/Views/analytics/subscription-table.blade.php b/src/Views/analytics/subscription-table.blade.php index fa59cac..5a4e103 100644 --- a/src/Views/analytics/subscription-table.blade.php +++ b/src/Views/analytics/subscription-table.blade.php @@ -10,15 +10,15 @@ @foreach ($subscriptions as $subscription) - @if (StoreHelper::subscriptionPlan($subscription)) + @if (commerce()->subscriptionPlan($subscription)) {!! $subscription->name !!} {{ $subscription->user->user()->name }} {{ $subscription->created_at->format('d M, Y') }} - ${{ StoreHelper::subscriptionPlan($subscription)->amount }} / {{ StoreHelper::subscriptionPlan($subscription)->frequency }} + ${{ commerce()->subscriptionPlan($subscription)->amount }} / {{ commerce()->subscriptionPlan($subscription)->frequency }} - @if (is_null($subscription->ends_at)) {!! StoreHelper::cancelSubscriptionBtn($subscription, 'btn btn-sm btn-danger float-right raw-margin-left-8') !!} @endif - Review Plan + @if (is_null($subscription->ends_at)) {!! commerce()->cancelSubscriptionBtn($subscription, 'btn btn-sm btn-danger float-right raw-margin-left-8') !!} @endif + Review Plan @endif diff --git a/src/Views/orders/item.blade.php b/src/Views/orders/item.blade.php index b8a856c..85f432e 100644 --- a/src/Views/orders/item.blade.php +++ b/src/Views/orders/item.blade.php @@ -1,5 +1,7 @@ @extends('cms::layouts.dashboard') +@section('pageTitle') Order Items: Edit @stop + @section('content') -
-

Order Items: Edit

-
- - @include('commerce::orders.breadcrumbs', ['location' => [['Order' => url(config('cms.backend-route-prefix', 'cms').'/orders/'.$orderItem->order_id.'/edit')], 'item']]) +
-
-
-

#{{ $orderItem->order->uuid }} @if ($orderItem->order->is_shipped) @endif

-
-
+ @include('commerce::orders.breadcrumbs', ['location' => [['Order' => url(config('cms.backend-route-prefix', 'cms').'/orders/'.$orderItem->order_id.'/edit')], 'item']]) -
-
- - - - - - - - - - - - - - - - - - - -
Product{{ ucfirst($orderItem->product->name) }}
Quantity{{ $orderItem->quantity }}
Variants - @foreach($orderItem->product_variants as $variant => $value) - {{ ucfirst($variant) }}: {{ $value }}
- @endforeach -
Status{{ ucfirst($orderItem->status) }}
+
+
+

#{{ $orderItem->order->uuid }} @if ($orderItem->order->is_shipped) @endif

+
-
- - - - - - - - - - - - - - - - - - - -
Subtotal${{ $orderItem->subtotal }}
Tax${{ $orderItem->tax }}
Shipping${{ $orderItem->shipping }}
Total${{ $orderItem->total }}
- @if (!$orderItem->was_refunded) -
- {!! Form::open(['id' => 'cancelItemForm', 'url' => config('cms.backend-route-prefix', 'cms').'/orders/item/cancel', 'method' => 'post', 'class' => 'inline-form pull-right']) !!} - @input_maker_create('id', ['type' => 'hidden'], $orderItem) - {!! Form::submit('Cancel Order Item', ['class' => 'btn btn-warning']) !!} - {!! Form::close() !!} -
- @endif - @if ($orderItem->was_refunded) -
- - Refunded - -
- - - - - - - - - +
+
+
AmountDate
${{ $orderItem->refund->amount }}{{ $orderItem->refund->created_at }}
+ + + + + + + + + + + + + + + + + + +
Product{{ ucfirst($orderItem->product->name) }}
Quantity{{ $orderItem->quantity }}
Variants + @foreach($orderItem->product_variants as $variant => $value) + {{ ucfirst($variant) }}: {{ $value }}
+ @endforeach +
Status{{ ucfirst($orderItem->status) }}
+
+
+ + + + + + + + + + + + + + + + + + +
Subtotal${{ $orderItem->subtotal }}
Tax${{ $orderItem->tax }}
Shipping${{ $orderItem->shipping }}
Total${{ $orderItem->total }}
- @endif + @if (!$orderItem->was_refunded) +
+ {!! Form::open(['id' => 'cancelItemForm', 'url' => config('cms.backend-route-prefix', 'cms').'/orders/item/cancel', 'method' => 'post', 'class' => 'inline-form pull-right']) !!} + @input_maker_create('id', ['type' => 'hidden'], $orderItem) + {!! Form::submit('Cancel Order Item', ['class' => 'btn btn-warning']) !!} + {!! Form::close() !!} +
+ @endif + + @if ($orderItem->was_refunded) +
+ + Refunded + +
+ + + + + + + + + +
AmountDate
${{ $orderItem->refund->amount }}{{ $orderItem->refund->created_at }}
+ @endif +
diff --git a/src/Views/transactions/edit.blade.php b/src/Views/transactions/edit.blade.php index 9088735..3993c45 100644 --- a/src/Views/transactions/edit.blade.php +++ b/src/Views/transactions/edit.blade.php @@ -85,7 +85,7 @@ @if ($order && $order->hasActiveOrderItems())
- Order #:{{ $order->id }} + Order: #{{ $order->id }}
You must cancel this order if you wish to refund this transaction.