diff --git a/app/Http/Livewire/ShowClientes.php b/app/Http/Livewire/ShowClientes.php index 5a1db01..85302ae 100755 --- a/app/Http/Livewire/ShowClientes.php +++ b/app/Http/Livewire/ShowClientes.php @@ -10,11 +10,8 @@ use Carbon\Carbon; use Illuminate\Support\Facades\Notification; use Illuminate\Support\Facades\Auth; use Livewire\Component; -use Exception; -use Illuminate\Support\Facades\Crypt; use App\Models\Configuracione; use Livewire\WithPagination; -use Twilio\Rest\Client; use Jantinnerezo\LivewireAlert\LivewireAlert; @@ -205,7 +202,7 @@ class ShowClientes extends Component // $client = new Client($account_sid, $auth_token); - // $client->messages->create($recipients, + // $client->messages->create($recipients, // ['from' => $twilio_number, 'body' => $message] ); // $this->alert('success', 'Notificación enviada por SMS! ', [ diff --git a/resources/views/components/icon-arrow-right.blade.php b/resources/views/components/icon-arrow-right.blade.php new file mode 100644 index 0000000..2dd2414 --- /dev/null +++ b/resources/views/components/icon-arrow-right.blade.php @@ -0,0 +1,4 @@ + +merge(['class' => 'w-5']) }} xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svgjs="http://svgjs.com/svgjs" version="1.1" x="0" y="0" viewBox="0 0 24 24" style="enable-background:new 0 0 512 512" xml:space="preserve"> + + diff --git a/resources/views/components/servicio.blade.php b/resources/views/components/servicio.blade.php index ddce4fa..4baa756 100755 --- a/resources/views/components/servicio.blade.php +++ b/resources/views/components/servicio.blade.php @@ -11,7 +11,7 @@
- + Servicios
@@ -38,10 +38,10 @@

{{$tarifa->dias}} Dias

- +

${{number_format($tarifa->valor)}} -

+

@@ -50,7 +50,7 @@
- @endif + @endif @endforeach @@ -73,7 +73,7 @@ {{-- Modal agregar servicios --}} -

- Información del cliente: + Información del cliente:

Ingrese los datos del cliente final.

- +
@@ -137,18 +137,18 @@
Pagara ${{number_format($total=((int)$valor_tarjetaPlan*(int)$cantidad_tarjetaPlan))}} .
- - + +
- + - - - - + + + + diff --git a/resources/views/livewire/portada-servicio.blade.php b/resources/views/livewire/portada-servicio.blade.php index 1ba4b94..f40699a 100755 --- a/resources/views/livewire/portada-servicio.blade.php +++ b/resources/views/livewire/portada-servicio.blade.php @@ -22,18 +22,10 @@
- - - - - + Promociones
- +
- +
@@ -123,7 +123,7 @@
{{-- Modal editar categoria --}} -
- +
@error('nombre') Requerido* @enderror
- +
diff --git a/resources/views/livewire/show-clientes.blade.php b/resources/views/livewire/show-clientes.blade.php index 8b44910..6ca588b 100755 --- a/resources/views/livewire/show-clientes.blade.php +++ b/resources/views/livewire/show-clientes.blade.php @@ -1,5 +1,4 @@
-
@@ -11,19 +10,10 @@
{{-- Buscador --}} -
+
- - - - - + Clientes
diff --git a/resources/views/livewire/show-configuracion.blade.php b/resources/views/livewire/show-configuracion.blade.php index ccb810c..c494bcd 100755 --- a/resources/views/livewire/show-configuracion.blade.php +++ b/resources/views/livewire/show-configuracion.blade.php @@ -14,15 +14,7 @@
- - - - - + Configuracion
diff --git a/resources/views/livewire/show-log-general.blade.php b/resources/views/livewire/show-log-general.blade.php index 5b9b2e4..ac1689a 100755 --- a/resources/views/livewire/show-log-general.blade.php +++ b/resources/views/livewire/show-log-general.blade.php @@ -3,9 +3,7 @@
- - - + Log general
diff --git a/resources/views/livewire/show-log-historial.blade.php b/resources/views/livewire/show-log-historial.blade.php index 2efd220..1291b8f 100644 --- a/resources/views/livewire/show-log-historial.blade.php +++ b/resources/views/livewire/show-log-historial.blade.php @@ -3,13 +3,7 @@ class="bg-[#f5f5f5] m-auto p-2 md:p-5 w-auto x-auto grid grid-cols-1 lg:grid-cols-1text-center rounded-xl py-4 px-2 ms:px-8 xl:mx-10 mb-8 ">
- - - + Log historial
diff --git a/resources/views/livewire/show-planes.blade.php b/resources/views/livewire/show-planes.blade.php index 47d5d29..3c37606 100755 --- a/resources/views/livewire/show-planes.blade.php +++ b/resources/views/livewire/show-planes.blade.php @@ -26,15 +26,7 @@
- - - - - + Planes
diff --git a/resources/views/livewire/show-promociones.blade.php b/resources/views/livewire/show-promociones.blade.php index a54fa14..612f8aa 100755 --- a/resources/views/livewire/show-promociones.blade.php +++ b/resources/views/livewire/show-promociones.blade.php @@ -24,15 +24,7 @@
- - - - - + Promociones
@if (auth()->user()->rol->nombre == 'super' || auth()->user()->rol->nombre == 'administrador') diff --git a/resources/views/livewire/show-recarga.blade.php b/resources/views/livewire/show-recarga.blade.php index 1922510..2eea3c6 100755 --- a/resources/views/livewire/show-recarga.blade.php +++ b/resources/views/livewire/show-recarga.blade.php @@ -1,82 +1,78 @@ -
-
+
+
- +

Cargando

-
-
- - - - Saldo -
-
+
+
+ + Saldo +
+
-
+
-
- Recargar saldo -
-
- @csrf -
+
+ Recargar saldo +
+ + @csrf +
Saldo actual:

${{ number_format($user->saldo->valor) }}

-
-
+
+
Monto a recargar -
-
+
+
+ class="border-2 w-1/2 md:w-auto mb-2 border-neutral-200 rounded-[0.8rem] shadow apperance-none focus:border-neutral-300 focus:ring-0 py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"> - @if($valor_recarga) -
Tu valor a pagar seria: $

- - {{$nuevo_valor = (((($valor_recarga)*0.03) + '700' )* 0.19)+ ((($valor_recarga)*0.03) + '700' ) + $valor_recarga}} - - -

- -
+ @if ($valor_recarga) +
Tu valor a pagar seria: $

+ + {{ $nuevo_valor = ($valor_recarga * 0.03 + '700') * 0.19 + ($valor_recarga * 0.03 + '700') + $valor_recarga }} + + +

+ +
@endif -

Se sumara $700 COP+ IVA + 3% adicional al pago en Mercado Pago por costos de sistema.

-
- -
+

Se sumara $700 COP+ IVA + 3% adicional al pago en + Mercado Pago por costos de sistema.

+
+ +
- + -
- - - - @@ -84,51 +80,50 @@
-

Historial

- - +

Historial

+
+ - - - + + + - - @php + + @php $i = 0; - @endphp - + @endphp + @foreach ($historial_recargas as $historial_recarga) - - {{-- --}} - - - - + + {{-- --}} + + + + @endforeach - -
FechaValorEstadoFechaValorEstado
{{date("d/m/Y", strtotime($historial_recarga->created_at))}}{{date("d/m/Y",strtotime($historial_recarga->created_at))}}${{ number_format($historial_recarga->monto) }}{{$historial_recarga->status}}
{{date("d/m/Y", strtotime($historial_recarga->created_at))}}{{ date('d/m/Y', strtotime($historial_recarga->created_at)) }}${{ number_format($historial_recarga->monto) }}{{ $historial_recarga->status }}
+ +
-
-
+
+
-{{--Modal nequi ---}} -
-
-
- - - + {{-- Modal nequi - --}} +
+
+
-
-
-
+ + + +
+
+
diff --git a/resources/views/livewire/show-recargas.blade.php b/resources/views/livewire/show-recargas.blade.php index 6fbd3b0..2d1c1a7 100755 --- a/resources/views/livewire/show-recargas.blade.php +++ b/resources/views/livewire/show-recargas.blade.php @@ -1,15 +1,9 @@
- +
- - - + Saldo
@@ -18,11 +12,11 @@ require base_path('vendor/autoload.php'); // Agrega credenciales MercadoPago\SDK::setAccessToken(config('services.mercadopago.token')); - - + + // Crea un objeto de preferencia $preference = new MercadoPago\Preference(); - + //$payment_methods = MercadoPago::get("/v1/payment_methods"); // Crea un ítem en la preferencia $item = new MercadoPago\Item(); @@ -31,7 +25,7 @@ $item->unit_price = $monto; $preference->external_reference = $referencia; $preference->back_urls = array( - + "success" => url('/orders/'), "failure" => url('/orders/'), "pending" => url('/orders/') @@ -39,10 +33,10 @@ $preference->auto_return = "approved"; $preference->items = array($item); $preference->save(); - - + + @endphp - +
@@ -55,14 +49,14 @@ ${{number_format($monto)}}

- +
- +
- +
@@ -70,27 +64,27 @@
- - - - + + + +
- +
- + - + diff --git a/resources/views/livewire/show-reportes.blade.php b/resources/views/livewire/show-reportes.blade.php index 76d7104..be34515 100755 --- a/resources/views/livewire/show-reportes.blade.php +++ b/resources/views/livewire/show-reportes.blade.php @@ -2,15 +2,7 @@
- - - - - + Reportes
@@ -21,7 +13,7 @@ @foreach($roles->usuarios as $usuario) @endforeach - + @endif @@ -75,14 +67,14 @@ Fecha Valor Estado - + Detalle @foreach ($historiales as $historial) - + {{$historial->fecha_inicio}} diff --git a/resources/views/livewire/show-roles.blade.php b/resources/views/livewire/show-roles.blade.php index ec267b9..7518eef 100755 --- a/resources/views/livewire/show-roles.blade.php +++ b/resources/views/livewire/show-roles.blade.php @@ -14,15 +14,7 @@ editar : @entangle('editar'),
- - - - - + Roles
- +
@@ -67,7 +59,7 @@ editar : @entangle('editar'), d="M6.75 12a.75.75 0 11-1.5 0 .75.75 0 011.5 0zM12.75 12a.75.75 0 11-1.5 0 .75.75 0 011.5 0zM18.75 12a.75.75 0 11-1.5 0 .75.75 0 011.5 0z" /> - +
- - + + {{-- Añadir rol --}} -
-
+
diff --git a/resources/views/livewire/show-servicio.blade.php b/resources/views/livewire/show-servicio.blade.php index a6ae2d6..871f879 100755 --- a/resources/views/livewire/show-servicio.blade.php +++ b/resources/views/livewire/show-servicio.blade.php @@ -53,15 +53,7 @@
- - - - - + Planes
- - - - - + Servicios
diff --git a/resources/views/livewire/show-top.blade.php b/resources/views/livewire/show-top.blade.php index c2a468b..7c3a113 100755 --- a/resources/views/livewire/show-top.blade.php +++ b/resources/views/livewire/show-top.blade.php @@ -3,13 +3,7 @@
- - - + Distribuidores
diff --git a/resources/views/livewire/show-usuarios.blade.php b/resources/views/livewire/show-usuarios.blade.php index 3f57db9..e05bb96 100755 --- a/resources/views/livewire/show-usuarios.blade.php +++ b/resources/views/livewire/show-usuarios.blade.php @@ -20,57 +20,118 @@
-
-
-
- - - - +
+
+ + Usuario +
+
+ @if (auth()->user()->rol->nombre !== 'administrador' && auth()->user()->rol->nombre !== 'editor') + Añadir + usuario + + - Usuario -
- @if (auth()->user()->rol->nombre !== 'administrador' && auth()->user()->rol->nombre !== 'editor') - Añadir - usuario - - - - - Mod. - tarifas promos. - - - - - - @endif + + Mod. + tarifas promos. + + + + + + @endif +
+ +
+ + + + + +
- {{-- Buscar --}} -
- -
+ + {{-- -Tabla usuarios - --}} -
+ + + + Nombre + Email + Rol + Ventas + Saldo + + + + + + @foreach ($usuarios as $usuario) + + {{$usuario->name ?? '' }} + {{$usuario->email ?? '' }} + {{$usuario->rol->nombre ?? '' }} + {{$usuario->historiales_venta_count ?? '' }} + {{$usuario->saldo->valor ?? '' }} + + + + + + +
+ + + + + + + +
+ + + @endforeach + + + {{ $usuarios->links() }} + + + + {{--
@@ -145,7 +206,7 @@
{{ $usuarios->links() }} -
+
--}} {{-- Gestionar precios --}}
- - - + Utilidades
diff --git a/resources/views/livewire/showcomprar.blade.php b/resources/views/livewire/showcomprar.blade.php index 29fcfd7..fa39d72 100755 --- a/resources/views/livewire/showcomprar.blade.php +++ b/resources/views/livewire/showcomprar.blade.php @@ -1,17 +1,11 @@
- - + +
- +
- - - + Saldo
@@ -20,11 +14,11 @@ require base_path('vendor/autoload.php'); // Agrega credenciales MercadoPago\SDK::setAccessToken(config('services.mercadopago.token')); - - + + // Crea un objeto de preferencia $preference = new MercadoPago\Preference(); - + //$payment_methods = MercadoPago::get("/v1/payment_methods"); // Crea un ítem en la preferencia $item = new MercadoPago\Item(); @@ -33,7 +27,7 @@ $item->quantity = 1; $item->unit_price = $monto; $preference->back_urls = array( - + "success" => url('/compras/'), "failure" => url('/compras/error'), "pending" => url('/compras/pendiente') @@ -41,10 +35,10 @@ $preference->auto_return = "approved"; $preference->items = array($item); $preference->save(); - - + + @endphp - +
@@ -57,14 +51,14 @@ ${{number_format($monto)}}

- +
- +
- +
@@ -72,27 +66,27 @@
- - - - + + + +
- +
- + - +