Skip to content

Commit 4dcdaa0

Browse files
suraj-webkulsuraj-webkul
committed
Merge remote-tracking branch 'upstream/master' into fix-1222
2 parents 34dbace + 226bf1c commit 4dcdaa0

File tree

20 files changed

+3923
-1387
lines changed

20 files changed

+3923
-1387
lines changed

‎composer.lock‎

Lines changed: 1834 additions & 1347 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/app.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,10 @@
111111

112112
'available_locales' => [
113113
'en' => 'English',
114+
'fa' => 'فارسی',
114115
'tr' => 'Türkçe',
115116
'ar' => 'Arabic',
117+
'es' => 'Español',
116118
],
117119

118120
/*

‎packages/Webkul/Admin/src/Exceptions/Handler.php‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
use App\Exceptions\Handler as AppExceptionHandler;
66
use Illuminate\Auth\AuthenticationException;
7+
use PDOException;
78
use Illuminate\Container\Container;
89
use Illuminate\Database\Eloquent\ModelNotFoundException;
9-
use PDOException;
1010
use Symfony\Component\HttpKernel\Exception\HttpException;
1111
use Throwable;
1212

@@ -52,6 +52,17 @@ public function render($request, Throwable $exception)
5252
return parent::render($request, $exception);
5353
}
5454

55+
/**
56+
* Report the exception.
57+
*
58+
* @param \Throwable $exception
59+
* @return void
60+
*/
61+
public function report(Throwable $exception)
62+
{
63+
//
64+
}
65+
5566
/**
5667
* Convert an authentication exception into a response.
5768
*
@@ -92,9 +103,7 @@ private function renderCustomResponse(Throwable $exception)
92103

93104
if ($exception instanceof ModelNotFoundException) {
94105
return $this->response($path, 404);
95-
}
96-
97-
if ($exception instanceof PDOException) {
106+
} elseif ($exception instanceof PDOException || $exception instanceof \ParseError) {
98107
return $this->response($path, 500);
99108
}
100109
}

‎packages/Webkul/Admin/src/Resources/assets/sass/rtl.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
@import url('https://fonts.googleapis.com/css2?family=Vazirmatn:wght@100;200;300;400;500;600;700;800;900&display=swap');
12
.rtl {
23
direction: rtl;
4+
font-family: 'Vazirmatn', 'Helvetica Neue', Arial, Helvetica, serif;
35

46
.anonymous-layout-container {
57
.center-box {

‎packages/Webkul/Admin/src/Resources/lang/es/app.php‎

Lines changed: 883 additions & 0 deletions
Large diffs are not rendered by default.

‎packages/Webkul/Admin/src/Resources/lang/fa/app.php‎

Lines changed: 865 additions & 0 deletions
Large diffs are not rendered by default.

‎packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232

3333
{!! view_render_event('admin.anonymous-layout.head') !!}
3434
</head>
35-
36-
<body @if (app()->getLocale() == 'ar') class="rtl" @endif>
35+
36+
<body @if (in_array(app()->getLocale(), ['fa', 'ar'])) class="rtl" @endif>
3737
<div id="app" class="anonymous-layout-container">
3838
<spinner-meter :full-page="true" v-if="! pageLoaded"></spinner-meter>
3939

@@ -74,7 +74,7 @@
7474
7575
7676
window.serverErrors = [];
77-
77+
7878
@if (isset($errors) && count($errors))
7979
window.serverErrors = @json($errors->getMessages());
8080
@endif

‎packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
</head>
3636

37-
<body style="scroll-behavior: smooth;" @if (app()->getLocale() == 'ar') class="rtl" @endif>
37+
<body style="scroll-behavior: smooth;" @if (in_array(app()->getLocale(), ['fa', 'ar'])) class="rtl" @endif>
3838
{!! view_render_event('admin.layout.body.before') !!}
3939

4040
<div id="app">

‎packages/Webkul/Admin/src/Resources/views/quotes/pdf.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205

206206
<td class="text-center">{!! core()->formatBasePrice($item->tax_amount, true) !!}</td>
207207

208-
<td class="text-center">{!! core()->formatBasePrice($item->total + $item->tax_amount, true) !!}</td>
208+
<td class="text-center">{!! core()->formatBasePrice($item->total + $item->tax_amount - $item->discount_amount, true) !!}</td>
209209
</tr>
210210
@endforeach
211211

‎packages/Webkul/UI/src/Resources/lang/es/app.php‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
<?php
2+
3+
return [
4+
'errors' => [
5+
'no-records' => '¡No se han encontrado registros!',
6+
'something-went-wrong' => '¡Algo salio mal!',
7+
],
8+
9+
'datagrid' => [
10+
'title' => 'Grilla de Datos',
11+
'actions' => 'Acciones',
12+
'edit' => 'Editar',
13+
'view' => 'Ver',
14+
'delete' => 'Borrar',
15+
'print' => 'Imprimir',
16+
'id' => 'Columnas Indices solo pueden tener valor mayor que cero',
17+
'cancel' => 'Cancelar',
18+
'download' => 'Descargar',
19+
'export' => 'Exportar',
20+
'select-format' => 'Seleccionar Formato',
21+
22+
'massaction' => [
23+
'select_action' => 'Seleccionar Acción',
24+
'mass-delete-confirm' => '¿Realmente desea eliminar los elementos tipo :resource seleccionados?',
25+
'mass-update-status' => '¿Realmente desea actualizar el estado de los elementos tipo :resource seleccionados?',
26+
'delete' => '¿Realmente desea realizar esta acción?',
27+
'edit' => '¿Realmente desea editar este elemento tipo :resource?',
28+
],
29+
30+
'zero-index' => 'Index columns can have values greater than zero only',
31+
'no-records' => 'No se encontraron registros',
32+
'filter-fields-missing' => 'Alguno de los campos requeridos es nulo, por favor establezca la columna, condición y valor apropiado',
33+
'click_on_action' => '¿Realmente desea realizar esta acción?',
34+
'search' => 'Buscar aquí...',
35+
'column' => 'Seleccionar Columna',
36+
'condition' => 'Seleccionar Condición',
37+
'contains' => 'Contiene',
38+
'ncontains' => 'No contiene',
39+
'equals' => 'Es igual a',
40+
'nequals' => 'No es igual a',
41+
'greater' => 'Mayor que',
42+
'less' => 'Menos que',
43+
'greatere' => 'Mayor o igual a',
44+
'lesse' => 'Menos or igual a',
45+
'value' => 'Seleccionar Valor',
46+
'true' => 'Verdadero / Activo',
47+
'update-status' => 'Actualizar Estado',
48+
'false' => 'Falso / Inactivo',
49+
'between' => 'Es entre',
50+
'apply' => 'Aplicar',
51+
'items-per-page' => 'Elementos por Pagina',
52+
'value-here' => 'Valor aquí',
53+
'numeric-value-here' => 'Valor Numérico aquí',
54+
'submit' => 'Enviar',
55+
"mandatory_mass_action" => "Por favor seleccione la acción a realizar.",
56+
'multiple_sort_keys' => '¡Error Fatal! Multiples Claves de Orden encontradas, Por favor resuelva la URL manualmente',
57+
'multiple_search_keys' => 'Multiples Claves de Búsqueda encontradas, Por favor resuelva la URL manualmente',
58+
'is-done' => 'Ha Terminado',
59+
'filter' => [
60+
'remove_all' => 'Quitar Todos',
61+
'title' => 'Filtrar',
62+
'apply_title' => 'Aplicar Filtro',
63+
'custom_filter' => 'Filtro Personalizado',
64+
'done' => 'Terminado',
65+
'to' => 'A',
66+
'date_range' => 'Rango de fecha',
67+
'start_date' => 'Fecha Inicio',
68+
'end_date' => 'Fecha Final',
69+
'today' => 'Hoy',
70+
'yesterday' => 'Ayer',
71+
'this_month' => 'Este Mes',
72+
'this_year' => 'Este Año',
73+
'last_month' => 'Mes Pasado',
74+
'apply' => 'Aplicar',
75+
'cancel' => 'Cancelar',
76+
'perPage' => 'Por Pagina',
77+
'is_done' => 'Ha Terminado',
78+
'created_by_id' => 'Creado por Id',
79+
'schedule_from' => 'Programar desde',
80+
'schedule_to' => 'Programar hasta',
81+
'created_at' => 'Creado en',
82+
'scheduled' => 'Programado',
83+
'duration' => 'Duración',
84+
],
85+
],
86+
87+
'add-attachment' => 'Agregar Adjunto',
88+
];

0 commit comments

Comments
 (0)