rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-03-21 12:29:03 +01:00
Code Issues Releases Activity

Merge branch 'product-store_integration' into product-store

Browse Source
This commit is contained in:
Du Peng 2022-10-18 10:31:37 +02:00
commit 7155a00870
19 changed files with 69 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/frontend/src/stylesheets/app.nav.scss
View File

@ -527,6 +527,19 @@
}
}
.nav {
&.nav-tabs {
display: flex;
& > li {
flex: 1;
width: auto;
display: block;
float: none;
a { height: 100%; }
}
}
}
// overrides bootstrap
.nav-justified > li, .nav-tabs.nav-justified > li {
cursor: pointer;

4
app/frontend/templates/admin/trainings/index.html
View File

@ -5,13 +5,13 @@
<a ng-click="backPrevLocation($event)"><i class="fas fa-long-arrow-alt-left "></i></a>
</section>
</div>
<div class="col-xs-10 col-sm-10 col-md-8 b-l b-r">
<div class="col-xs-10 col-sm-10 col-md-8 b-l b-r-md">
<section class="heading-title">
<h1 translate>{{ 'app.admin.trainings.trainings_monitoring' }}</h1>
</section>
</div>
<div class="col-md-3">
<div class="col-xs-12 col-sm-12 col-md-3 b-t hide-b-md">
<section class="heading-actions wrapper">
<a role="button" ui-sref="app.admin.calendar" class="btn btn-lg btn-default rounded m-t-sm text-sm">
<i class="fa fa-calendar-check-o m-r" aria-hidden="true"></i><span translate>{{ 'app.admin.trainings.plan_session' }}</span>

12
config/locales/app.admin.de.yml
View File

@ -2005,7 +2005,7 @@ de:
successfully_created: "The new product has been created."
edit_product:
successfully_updated: "The product has been updated."
successfully_cloned: "The product has been cloned."
successfully_cloned: "The product has been duplicated."
product_form:
product_parameters: "Product parameters"
stock_management: "Stock management"
@ -2028,11 +2028,11 @@ de:
product_files: "Document"
product_files_info: "<strong>Information</strong></br>Add documents related to this product. They will be presented in the product sheet, in a separate block. You can only upload PDF documents."
add_product_file: "Add a document"
product_images: "Pictures of the product"
product_images: "Visuals of the product"
product_images_info: "<strong>Advice</strong></br>We advise you to use a square format, JPG or PNG. For JPG, please use white for the background colour. The main visual will be the first presented in the product sheet."
add_product_image: "Add an image"
add_product_image: "Add a visual"
save: "Save"
clone: "Clone"
clone: "Duplicate"
product_stock_form:
stock_up_to_date: "Stock up to date"
date_time: "{DATE} - {TIME}"
@ -2077,8 +2077,8 @@ de:
other_in: "Other (in)"
other_out: "Other (out)"
clone_product_model:
clone_product: "Clone the product"
clone: "Clone"
clone_product: "Duplicate the product"
clone: "Duplicate"
orders:
heading: "Orders"
create_order: "Create an order"

12
config/locales/app.admin.en.yml
View File

@ -2005,7 +2005,7 @@ en:
successfully_created: "The new product has been created."
edit_product:
successfully_updated: "The product has been updated."
successfully_cloned: "The product has been cloned."
successfully_cloned: "The product has been duplicated."
product_form:
product_parameters: "Product parameters"
stock_management: "Stock management"
@ -2028,11 +2028,11 @@ en:
product_files: "Document"
product_files_info: "<strong>Information</strong></br>Add documents related to this product. They will be presented in the product sheet, in a separate block. You can only upload PDF documents."
add_product_file: "Add a document"
product_images: "Pictures of the product"
product_images: "Visuals of the product"
product_images_info: "<strong>Advice</strong></br>We advise you to use a square format, JPG or PNG. For JPG, please use white for the background colour. The main visual will be the first presented in the product sheet."
add_product_image: "Add an image"
add_product_image: "Add a visual"
save: "Save"
clone: "Clone"
clone: "Duplicate"
product_stock_form:
stock_up_to_date: "Stock up to date"
date_time: "{DATE} - {TIME}"
@ -2077,8 +2077,8 @@ en:
other_in: "Other (in)"
other_out: "Other (out)"
clone_product_model:
clone_product: "Clone the product"
clone: "Clone"
clone_product: "Duplicate the product"
clone: "Duplicate"
orders:
heading: "Orders"
create_order: "Create an order"

12
config/locales/app.admin.es.yml
View File

@ -2005,7 +2005,7 @@ es:
successfully_created: "The new product has been created."
edit_product:
successfully_updated: "The product has been updated."
successfully_cloned: "The product has been cloned."
successfully_cloned: "The product has been duplicated."
product_form:
product_parameters: "Product parameters"
stock_management: "Stock management"
@ -2028,11 +2028,11 @@ es:
product_files: "Document"
product_files_info: "<strong>Information</strong></br>Add documents related to this product. They will be presented in the product sheet, in a separate block. You can only upload PDF documents."
add_product_file: "Add a document"
product_images: "Pictures of the product"
product_images: "Visuals of the product"
product_images_info: "<strong>Advice</strong></br>We advise you to use a square format, JPG or PNG. For JPG, please use white for the background colour. The main visual will be the first presented in the product sheet."
add_product_image: "Add an image"
add_product_image: "Add a visual"
save: "Save"
clone: "Clone"
clone: "Duplicate"
product_stock_form:
stock_up_to_date: "Stock up to date"
date_time: "{DATE} - {TIME}"
@ -2077,8 +2077,8 @@ es:
other_in: "Other (in)"
other_out: "Other (out)"
clone_product_model:
clone_product: "Clone the product"
clone: "Clone"
clone_product: "Duplicate the product"
clone: "Duplicate"
orders:
heading: "Orders"
create_order: "Create an order"

16
config/locales/app.admin.fr.yml
View File

@ -2005,7 +2005,7 @@ fr:
successfully_created: "Le nouveau produit a été créé."
edit_product:
successfully_updated: "Le produit a été modifié."
successfully_cloned: "Le produit a été cloné."
successfully_cloned: "Le produit a été dupliqué."
product_form:
product_parameters: "Paramètres du produit"
stock_management: "Gestion des stocks"
@ -2028,11 +2028,11 @@ fr:
product_files: "Document"
product_files_info: "<strong>Informations</strong></br>Ajouter des documents liés à ce produit. Ils seront présentés dans la fiche produit, dans un bloc séparé. Vous ne pouvez télécharger que des documents PDF."
add_product_file: "Ajouter un document"
product_images: "Photos du produit"
product_images: "Visuels du produit"
product_images_info: "<strong>Conseil</strong></br>Nous vous conseillons d'utiliser un format carré, JPG ou PNG. Pour le JPG, veuillez utiliser le blanc pour la couleur de fond. Le visuel principal sera le premier présenté dans la fiche produit."
add_product_image: "Ajouter une image"
add_product_image: "Ajouter un visuel"
save: "Enregistrer"
clone: "Cloner"
clone: "Dupliquer"
product_stock_form:
stock_up_to_date: "Stock à jour"
date_time: "{DATE} - {TIME}"
@ -2040,8 +2040,8 @@ fr:
save_reminder: "N'oubliez pas de sauvegarder vos opérations"
low_stock_threshold: "Définir un seuil de stock bas"
stock_threshold_toggle: "Activer le seuil de stock"
stock_threshold_information: "<strong>Informations</strong></br>Définissez un seuil de stock bas et recevez une notification quand il est atteint.<br>Au-dessus du seuil, le produit est disponible dans la boutique. Lorsque le seuil est atteint, la quantité de produit est étiquetée comme faible."
low_stock: "Stock faible"
stock_threshold_information: "<strong>Informations</strong></br>Définissez un seuil de stock bas et recevez une notification quand il est atteint.<br>Au-dessus du seuil, le produit est disponible dans la boutique. Lorsque le seuil est atteint, la quantité de produit est étiquetée comme limité."
low_stock: "Stock limité"
threshold_level: "Niveau de seuil minimum"
threshold_alert: "M'avertir lorsque le seuil est atteint"
events_history: "Historique des événements"
@ -2077,8 +2077,8 @@ fr:
other_in: "Autre (entrant)"
other_out: "Autre (sortant)"
clone_product_model:
clone_product: "Cloner le produit"
clone: "Cloner"
clone_product: "Dupliquer le produit"
clone: "Dupliquer"
orders:
heading: "Commandes"
create_order: "Créer une commande"

12
config/locales/app.admin.no.yml
View File

@ -2005,7 +2005,7 @@
successfully_created: "The new product has been created."
edit_product:
successfully_updated: "The product has been updated."
successfully_cloned: "The product has been cloned."
successfully_cloned: "The product has been duplicated."
product_form:
product_parameters: "Product parameters"
stock_management: "Stock management"
@ -2028,11 +2028,11 @@
product_files: "Document"
product_files_info: "<strong>Information</strong></br>Add documents related to this product. They will be presented in the product sheet, in a separate block. You can only upload PDF documents."
add_product_file: "Add a document"
product_images: "Pictures of the product"
product_images: "Visuals of the product"
product_images_info: "<strong>Advice</strong></br>We advise you to use a square format, JPG or PNG. For JPG, please use white for the background colour. The main visual will be the first presented in the product sheet."
add_product_image: "Add an image"
add_product_image: "Add a visual"
save: "Save"
clone: "Clone"
clone: "Duplicate"
product_stock_form:
stock_up_to_date: "Stock up to date"
date_time: "{DATE} - {TIME}"
@ -2077,8 +2077,8 @@
other_in: "Other (in)"
other_out: "Other (out)"
clone_product_model:
clone_product: "Clone the product"
clone: "Clone"
clone_product: "Duplicate the product"
clone: "Duplicate"
orders:
heading: "Orders"
create_order: "Create an order"

12
config/locales/app.admin.pt.yml
View File

@ -2005,7 +2005,7 @@ pt:
successfully_created: "The new product has been created."
edit_product:
successfully_updated: "The product has been updated."
successfully_cloned: "The product has been cloned."
successfully_cloned: "The product has been duplicated."
product_form:
product_parameters: "Product parameters"
stock_management: "Stock management"
@ -2028,11 +2028,11 @@ pt:
product_files: "Document"
product_files_info: "<strong>Information</strong></br>Add documents related to this product. They will be presented in the product sheet, in a separate block. You can only upload PDF documents."
add_product_file: "Add a document"
product_images: "Pictures of the product"
product_images: "Visuals of the product"
product_images_info: "<strong>Advice</strong></br>We advise you to use a square format, JPG or PNG. For JPG, please use white for the background colour. The main visual will be the first presented in the product sheet."
add_product_image: "Add an image"
add_product_image: "Add a visual"
save: "Save"
clone: "Clone"
clone: "Duplicate"
product_stock_form:
stock_up_to_date: "Stock up to date"
date_time: "{DATE} - {TIME}"
@ -2077,8 +2077,8 @@ pt:
other_in: "Other (in)"
other_out: "Other (out)"
clone_product_model:
clone_product: "Clone the product"
clone: "Clone"
clone_product: "Duplicate the product"
clone: "Duplicate"
orders:
heading: "Orders"
create_order: "Create an order"

12
config/locales/app.admin.zu.yml
View File

@ -2005,7 +2005,7 @@ zu:
successfully_created: "crwdns30950:0crwdne30950:0"
edit_product:
successfully_updated: "crwdns30952:0crwdne30952:0"
successfully_cloned: "crwdns31176:0crwdne31176:0"
successfully_cloned: "crwdns31208:0crwdne31208:0"
product_form:
product_parameters: "crwdns30954:0crwdne30954:0"
stock_management: "crwdns30956:0crwdne30956:0"
@ -2028,11 +2028,11 @@ zu:
product_files: "crwdns30990:0crwdne30990:0"
product_files_info: "crwdns30992:0crwdne30992:0"
add_product_file: "crwdns30994:0crwdne30994:0"
product_images: "crwdns30996:0crwdne30996:0"
product_images: "crwdns31202:0crwdne31202:0"
product_images_info: "crwdns30998:0crwdne30998:0"
add_product_image: "crwdns31000:0crwdne31000:0"
add_product_image: "crwdns31204:0crwdne31204:0"
save: "crwdns31002:0crwdne31002:0"
clone: "crwdns31178:0crwdne31178:0"
clone: "crwdns31210:0crwdne31210:0"
product_stock_form:
stock_up_to_date: "crwdns31004:0crwdne31004:0"
date_time: "crwdns31006:0{DATE}crwdnd31006:0{TIME}crwdne31006:0"
@ -2077,8 +2077,8 @@ zu:
other_in: "crwdns31082:0crwdne31082:0"
other_out: "crwdns31084:0crwdne31084:0"
clone_product_model:
clone_product: "crwdns31180:0crwdne31180:0"
clone: "crwdns31182:0crwdne31182:0"
clone_product: "crwdns31212:0crwdne31212:0"
clone: "crwdns31214:0crwdne31214:0"
orders:
heading: "crwdns31086:0crwdne31086:0"
create_order: "crwdns31088:0crwdne31088:0"

2
config/locales/app.public.fr.yml
View File

@ -408,7 +408,6 @@ fr:
documentation: "Documentation"
minimum_purchase: "Achat minimum : "
add_to_cart: "Ajouter au panier"
stock_limit: "Vous avez atteint la limite actuelle de stock"
stock_status:
available: "Disponible"
limited_stock: "Stock limité"
@ -417,7 +416,6 @@ fr:
minimum_purchase: "Achat minimum : "
add: "Ajouter"
add_to_cart: "Ajouter au panier"
stock_limit: "Vous avez atteint la limite actuelle de stock"
product_price:
per_unit: "/ unité"
free: "Gratuit"

2
config/locales/app.shared.de.yml
View File

@ -559,7 +559,7 @@ de:
form_image_upload:
browse: "Browse"
edit: "Edit"
main_image: "Main image"
main_image: "Main visual"
store:
order_item:
total: "Total"

2
config/locales/app.shared.en.yml
View File

@ -559,7 +559,7 @@ en:
form_image_upload:
browse: "Browse"
edit: "Edit"
main_image: "Main image"
main_image: "Main visual"
store:
order_item:
total: "Total"

2
config/locales/app.shared.es.yml
View File

@ -559,7 +559,7 @@ es:
form_image_upload:
browse: "Browse"
edit: "Edit"
main_image: "Main image"
main_image: "Main visual"
store:
order_item:
total: "Total"

2
config/locales/app.shared.fr.yml
View File

@ -559,7 +559,7 @@ fr:
form_image_upload:
browse: "Parcourir"
edit: "Modifier"
main_image: "Image principale"
main_image: "Visuel principal"
store:
order_item:
total: "Total"

2
config/locales/app.shared.no.yml
View File

@ -559,7 +559,7 @@
form_image_upload:
browse: "Browse"
edit: "Edit"
main_image: "Main image"
main_image: "Main visual"
store:
order_item:
total: "Total"

2
config/locales/app.shared.pt.yml
View File

@ -559,7 +559,7 @@ pt:
form_image_upload:
browse: "Browse"
edit: "Edit"
main_image: "Main image"
main_image: "Main visual"
store:
order_item:
total: "Total"

2
config/locales/app.shared.zu.yml
View File

@ -559,7 +559,7 @@ zu:
form_image_upload:
browse: "crwdns30424:0crwdne30424:0"
edit: "crwdns30426:0crwdne30426:0"
main_image: "crwdns30428:0crwdne30428:0"
main_image: "crwdns31206:0crwdne31206:0"
store:
order_item:
total: "crwdns30430:0crwdne30430:0"

2
config/locales/fr.yml
View File

@ -366,7 +366,7 @@ fr:
members: "des membres"
view_results: "Voir les résultats."
notify_admin_low_stock_threshold:
low_stock: "Stock faible pour %{PRODUCT}. "
low_stock: "Stock limité pour %{PRODUCT}. "
view_product: "Voir le produit."
notify_member_about_coupon:
enjoy_a_discount_of_PERCENT_with_code_CODE: "Bénéficiez d'une remise de %{PERCENT} % avec le code %{CODE}"

4
config/locales/mails.fr.yml
View File

@ -247,9 +247,9 @@ fr:
category_members: "des membres"
click_to_view_results: "Cliquez ici pour voir les résultats"
notify_admin_low_stock_threshold:
subject: "Alerte de stock faible"
subject: "Alerte de stock limité"
body:
low_stock: "Un nouveau mouvement de stock de %{PRODUCT} a dépassé le seuil de stock faible."
low_stock: "Un nouveau mouvement de stock de %{PRODUCT} a dépassé le seuil de stock limité."
stocks_state_html: "Statut actuel des stocks : <ul><li>interne : %{INTERNAL}</li><li>externe : %{EXTERNAL}</li></ul>"
manage_stock: "Gérer les stocks de ce produit"
notify_member_about_coupon: