Skip to content

Issue #2168 has been fixed. #2203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: 2.1
Choose a base branch
from
Open

Issue #2168 has been fixed. #2203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e46dc8c
Issue #2168 has been fixed.
suraj-webkul May 14, 2025
82de005
chore: applied pint changes
suraj-webkul May 14, 2025
4f6768d
remove expired routes column as it already available as expired at.
suraj-webkul May 15, 2025
6228d03
remove expired routes column as it already available as expired at.
suraj-webkul May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions packages/Webkul/Admin/src/DataGrids/Quote/QuoteDataGrid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,6 @@ public function prepareColumns(): void
],
]);

$this->addColumn([
'index' => 'expired_quotes',
'label' => trans('admin::app.quotes.index.datagrid.expired-quotes'),
'type' => 'date',
'searchable' => false,
'filterable' => true,
]);

$this->addColumn([
'index' => 'person_name',
'label' => trans('admin::app.quotes.index.datagrid.person'),
Expand Down
1 change: 0 additions & 1 deletion packages/Webkul/Admin/src/Resources/lang/ar/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,6 @@
'sales-person' => 'مندوب المبيعات',
'expired-at' => 'تاريخ الانتهاء',
'created-at' => 'تاريخ الإنشاء',
'expired-quotes' => 'عرض السعر المنتهي',
'person' => 'الشخص',
'subtotal' => 'المجموع الفرعي',
'discount' => 'الخصم',
Expand Down
1 change: 0 additions & 1 deletion packages/Webkul/Admin/src/Resources/lang/en/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,6 @@
'sales-person' => 'Sales Person',
'expired-at' => 'Expired At',
'created-at' => 'Created At',
'expired-quotes' => 'Expired Quote',
'person' => 'Person',
'subtotal' => 'Subtotal',
'discount' => 'Discount',
Expand Down
1 change: 0 additions & 1 deletion packages/Webkul/Admin/src/Resources/lang/es/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,6 @@
'sales-person' => 'Vendedor',
'expired-at' => 'Vence en',
'created-at' => 'Creado en',
'expired-quotes' => 'Cotización Expirada',
'person' => 'Persona',
'subtotal' => 'Subtotal',
'discount' => 'Descuento',
Expand Down
1 change: 0 additions & 1 deletion packages/Webkul/Admin/src/Resources/lang/fa/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,6 @@
'sales-person' => 'فروشنده',
'expired-at' => 'تاریخ انقضا',
'created-at' => 'تاریخ ایجاد',
'expired-quotes' => 'نقل‌قول‌های منقضی‌شده',
'person' => 'شخص',
'subtotal' => 'جمع جزء',
'discount' => 'تخفیف',
Expand Down
1 change: 0 additions & 1 deletion packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,6 @@
'sales-person' => 'Vendedor',
'expired-at' => 'Expirado em',
'created-at' => 'Criado em',
'expired-quotes' => 'Cotação Expirada',
'person' => 'Pessoa',
'subtotal' => 'Subtotal',
'discount' => 'Desconto',
Expand Down
1 change: 0 additions & 1 deletion packages/Webkul/Admin/src/Resources/lang/tr/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,6 @@
'sales-person' => 'Satış Temsilcisi',
'expired-at' => 'Son Kullanma Tarihi',
'created-at' => 'Oluşturulma Tarihi',
'expired-quotes' => 'Süresi Dolmuş Teklifler',
'person' => 'Kişi',
'subtotal' => 'Ara Toplam',
'discount' => 'İndirim',
Expand Down
1 change: 0 additions & 1 deletion packages/Webkul/Admin/src/Resources/lang/vi/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,6 @@
'sales-person' => 'Nhân viên bán hàng',
'expired-at' => 'Hết hạn vào',
'created-at' => 'Tạo vào',
'expired-quotes' => 'Báo giá hết hạn',
'person' => 'Người',
'subtotal' => 'Tổng phụ',
'discount' => 'Giảm giá',
Expand Down
2 changes: 1 addition & 1 deletion ...ebkul/Contact/src/Database/Migrations/2024_09_09_112201_add_unique_id_to_person_table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public function up(): void
$table->string('unique_id')->nullable()->unique();
});

$tableName = DB::getTablePrefix() . 'persons';
$tableName = DB::getTablePrefix().'persons';

DB::statement("
UPDATE {$tableName}
Expand Down
Loading