Skip to content

Commit

Permalink
Merge pull request #1135 from sumitwebkul/gli-2177
Browse files Browse the repository at this point in the history
Updated: Order Return states names changes and Translations added
  • Loading branch information
rohit053 authored Jul 2, 2024
2 parents da3fbbb + d76d9f5 commit 1022261
Show file tree
Hide file tree
Showing 31 changed files with 89 additions and 89 deletions.
8 changes: 4 additions & 4 deletions classes/order/OrderReturn.php
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ public function changeIdOrderReturnState($newOrderReturnState, $idLang = 0)
Mail::Send(
(int)$idLang,
$objOrderReturnState->customer_template,
$objOrderReturnState->name,
sprintf(Mail::l('Refund %s', (int)$idLang), $objOrderReturnState->name),
$data,
$objCustomer->email,
$objCustomer->firstname.' '.$objCustomer->lastname,
Expand Down Expand Up @@ -562,7 +562,7 @@ public function changeIdOrderReturnState($newOrderReturnState, $idLang = 0)
Mail::Send(
(int)$idLang,
$objOrderReturnState->admin_template,
$objOrderReturnState->name,
sprintf(Mail::l('Refund %s', (int)$idLang), $objOrderReturnState->name),
$data,
$superAdminEmployee['email'],
$superAdminEmployee['firstname'].' '.$superAdminEmployee['lastname'],
Expand Down Expand Up @@ -592,7 +592,7 @@ public function changeIdOrderReturnState($newOrderReturnState, $idLang = 0)
Mail::Send(
(int)$idLang,
$objOrderReturnState->admin_template,
$objOrderReturnState->name,
sprintf(Mail::l('Refund %s', (int)$idLang), $objOrderReturnState->name),
$data,
$objHotel->email,
null,
Expand Down Expand Up @@ -624,7 +624,7 @@ public function changeIdOrderReturnState($newOrderReturnState, $idLang = 0)
Mail::Send(
(int)$idLang,
$objOrderReturnState->admin_template,
$objOrderReturnState->name,
sprintf(Mail::l('Refund %s', (int)$idLang), $objOrderReturnState->name),
$data,
$empl['email'],
$empl['firstname'].' '.$empl['lastname'],
Expand Down
6 changes: 3 additions & 3 deletions install/langs/bg/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>В очакване</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>Отказано</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>Завършено</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
6 changes: 3 additions & 3 deletions install/langs/bn/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>বিচারাধীন</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>অস্বীকৃত</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>সম্পন্ন</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
4 changes: 2 additions & 2 deletions install/langs/br/data/order_return_state.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>Denied</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>Completed</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
6 changes: 3 additions & 3 deletions install/langs/cs/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>čekající</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>zamítnuto</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>Dokončeno</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
6 changes: 3 additions & 3 deletions install/langs/de/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>Ausstehend</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>Bestritten</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>Vollendet</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
4 changes: 2 additions & 2 deletions install/langs/en/data/order_return_state.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>Denied</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>Completed</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
6 changes: 3 additions & 3 deletions install/langs/es/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>Pendiente</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>Denegada</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>Terminada</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
6 changes: 3 additions & 3 deletions install/langs/fa/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>انتظار</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>تکذیب کرد</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>تکمیل شد</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
6 changes: 3 additions & 3 deletions install/langs/fr/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>En attente</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>Refusée</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>Complété</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
6 changes: 3 additions & 3 deletions install/langs/he/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>ממתין ל</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>נדחתה</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>הושלם</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
6 changes: 3 additions & 3 deletions install/langs/hr/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>U tijeku</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>odbijeno</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>Završeno</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
6 changes: 3 additions & 3 deletions install/langs/hu/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>Függőben levő</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>Megtagadva</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>Befejezve</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
6 changes: 3 additions & 3 deletions install/langs/id/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>Tertunda</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>Ditolak</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>Lengkap</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
6 changes: 3 additions & 3 deletions install/langs/it/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>In attesa di</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>Negato</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>Completato</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
6 changes: 3 additions & 3 deletions install/langs/lt/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>Kol</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>Neigė</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>Užbaigta</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
6 changes: 3 additions & 3 deletions install/langs/mk/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>Во очекување</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>Демантирано</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>Завршено</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
6 changes: 3 additions & 3 deletions install/langs/nl/data/order_return_state.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0"?>
<entity_order_return_state>
<order_return_state id="Pending">
<name>Pending</name>
<name>In behandeling</name>
<customer_template>order_refund_pending_customer</customer_template>
<admin_template>order_refund_pending_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_denied">
<name>Refund denied</name>
<name>Geweigerd</name>
<customer_template>order_refund_denied_customer</customer_template>
<admin_template>order_refund_denied_admin</admin_template>
</order_return_state>
<order_return_state id="Refund_completed">
<name>Refund completed</name>
<name>Voltooid</name>
<customer_template>order_refund_completed_customer</customer_template>
<admin_template>order_refund_completed_admin</admin_template>
</order_return_state>
Expand Down
Loading

0 comments on commit 1022261

Please sign in to comment.