rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch 'origin/265-cmb-project' into 'master'

Browse source 
Origin/265 cmb project

See merge request jankstudio/resq!314
This commit is contained in:
Kendrick Chan 2019-09-17 06:49:45 +00:00
commit 06a53352fe
18 changed files with 177 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
composer.json
View file

@ -25,6 +25,7 @@
"symfony/orm-pack": "^1.0",
"symfony/profiler-pack": "^1.0",
"symfony/security-bundle": "^4.0",
"symfony/translation": "^4.0",
"symfony/twig-bundle": "^4.0",
"symfony/validator": "^4.0",
"symfony/yaml": "^4.0"

78
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "60a481bcfc7c5465c831c26c20d2d7f6",
"content-hash": "ef9a215401e1fec51336e1d6a9df52d9",
"packages": [
{
"name": "catalyst/auth-bundle",
@ -4517,6 +4517,82 @@
"homepage": "https://symfony.com",
"time": "2019-05-27T08:16:38+00:00"
},
{
"name": "symfony/translation",
"version": "v4.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "4e3e39cc485304f807622bdc64938e4633396406"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/4e3e39cc485304f807622bdc64938e4633396406",
"reference": "4e3e39cc485304f807622bdc64938e4633396406",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/translation-contracts": "^1.1.2"
},
"conflict": {
"symfony/config": "<3.4",
"symfony/dependency-injection": "<3.4",
"symfony/yaml": "<3.4"
},
"provide": {
"symfony/translation-implementation": "1.0"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~3.4|~4.0",
"symfony/console": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0",
"symfony/finder": "~2.8|~3.0|~4.0",
"symfony/http-kernel": "~3.4|~4.0",
"symfony/intl": "~3.4|~4.0",
"symfony/service-contracts": "^1.1.2",
"symfony/var-dumper": "~3.4|~4.0",
"symfony/yaml": "~3.4|~4.0"
},
"suggest": {
"psr/log-implementation": "To use logging capability in translator",
"symfony/config": "",
"symfony/yaml": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.3-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Translation\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
"time": "2019-07-18T10:34:59+00:00"
},
{
"name": "symfony/translation-contracts",
"version": "v1.1.2",

6
config/packages/translation.yaml Normal file
View file

@ -0,0 +1,6 @@
framework:
default_locale: en
translator:
default_path: '%kernel.project_dir%/translations'
fallbacks:
- en

BIN
public/moogle-assets/74fdd1d049be99432a128ee40e93bff7.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 44 KiB

BIN
public/moogle-assets/moogle_face_icon.ico Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 106 KiB

BIN
public/moogle-assets/moogleicon.ico Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 101 KiB

BIN
public/moogle-assets/stuffed_animal_moogle.ico Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 95 KiB

BIN
public/moogle-assets/yellow_moogle.ico Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 126 KiB

11
src/Controller/JobOrderController.php
View file

@ -42,6 +42,7 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Validator\Validator\ValidatorInterface;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Contracts\Translation\TranslatorInterface;
use Catalyst\MenuBundle\Annotation\Menu;
@ -1918,7 +1919,7 @@ class JobOrderController extends Controller
}
public function pdfForm(Request $req, $id)
public function pdfForm(Request $req, $id, TranslatorInterface $translator)
{
$this->denyAccessUnlessGranted('jo_pdf.list', null, 'No access.');
@ -1934,10 +1935,14 @@ class JobOrderController extends Controller
// set output filename
$filename = 'job-order-' . $obj->getID() . '.pdf';
// translate the title and the logo for the pdf
$translated_title = $translator->trans('jo_title_pdf');
$translated_logo = $translator->trans('image_jo_pdf');
// generate the pdf
$pdf = new FPDF('P', 'mm', 'letter');
$pdf->AddPage();
$pdf->SetTitle('Motolite Res-Q Job Order #' . $obj->getID());
$pdf->setTitle($translated_title . ' #' . $obj->getID());
$pdf->SetFillColor(211, 211, 211);
// style defaults
@ -1957,7 +1962,7 @@ class JobOrderController extends Controller
$val_width = 60;
// insert the logo
$image_path = $this->get('kernel')->getProjectDir() . '/public/assets/images/logo-resq.png';
$image_path = $this->get('kernel')->getProjectDir() . $translated_logo;
$pdf->Image($image_path, $col1_x, 10);
// insert JO number

13
symfony.lock
View file

@ -293,6 +293,19 @@
"symfony/thanks": {
"version": "v1.1.0"
},
"symfony/translation": {
"version": "3.3",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "master",
"version": "3.3",
"ref": "2ad9d2545bce8ca1a863e50e92141f0b9d87ffcd"
},
"files": [
"config/packages/translation.yaml",
"translations/.gitignore"
]
},
"symfony/translation-contracts": {
"version": "v1.1.2"
},

10
templates/base.html.twig
View file

@ -5,7 +5,7 @@
<!-- begin::Head -->
<head>
<meta charset="UTF-8">
<title>{% block title %}Motolite Res-Q{% endblock %}</title>
<title>{% block title %}{% trans %}block_title{% endtrans %}{% endblock %}</title>
<!--begin::Web font -->
<script src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.16/webfont.js"></script>
@ -29,8 +29,8 @@
<!--end::Base Styles -->
<link rel="apple-touch-icon" sizes="180x180" href="/assets/images/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/assets/images/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/assets/images/favicon/favicon-16x16.png">
<link rel="icon" type="image/png" sizes="32x32" href="{% trans %}icon_base_32x32{% endtrans %}">
<link rel="icon" type="image/png" sizes="16x16" href="{% trans %}icon_base_16x16{% endtrans %}">
<link rel="manifest" href="/assets/images/favicon/manifest.json">
<meta name="theme-color" content="#ffffff">
@ -52,7 +52,7 @@
<div class="m-stack m-stack--ver m-stack--general">
<div class="m-stack__item m-stack__item--middle m-brand__logo">
<a href="{{ path('home') }}" class="m-brand__logo-wrapper">
<img alt="Motolite" src="/assets/images/logo-motolite.png"/>
<img alt="{% trans %}alt_image_dashboard{% endtrans %}" src="{% trans %}image_dashboard{% endtrans %}"/>
</a>
</div>
<div class="m-stack__item m-stack__item--middle m-brand__tools">
@ -676,7 +676,7 @@
<div class="m-stack m-stack--flex-tablet-and-mobile m-stack--ver m-stack--desktop">
<div class="m-stack__item m-stack__item--left m-stack__item--middle m-stack__item--last">
<span class="m-footer__copyright">
{{ "now"|date("Y") }} &copy; Motolite Res-Q
{{ "now"|date("Y") }} &copy; {% trans %}copyright{% endtrans %}
</span>
</div>
<div class="m-stack__item m-stack__item--right m-stack__item--middle m-stack__item--first">

6
templates/battery-size/form.html.twig
View file

@ -46,7 +46,7 @@
</div>
<div class="form-group m-form__group row no-border">
<label class="col-lg-3 col-form-label" data-field="name">
Trade-in Motolite
{% trans %}battery_size_tradein_brand{% endtrans %}
</label>
<div class="col-lg-9">
<input type="text" name="tip_motolite" class="form-control m-input" value="{{ obj.getTIPriceMotolite }}">
@ -55,7 +55,7 @@
</div>
<div class="form-group m-form__group row no-border">
<label class="col-lg-3 col-form-label" data-field="tip_premium">
Trade-in Premium
{% trans %}battery_size_tradein_premium{% endtrans %}
</label>
<div class="col-lg-9">
<input type="text" name="tip_premium" class="form-control m-input" value="{{ obj.getTIPricePremium }}">
@ -64,7 +64,7 @@
</div>
<div class="form-group m-form__group row no-border">
<label class="col-lg-3 col-form-label" data-field="tip_other">
Trade-in Other
{% trans %}battery_size_tradein_other{% endtrans %}
</label>
<div class="col-lg-9">
<input type="text" name="tip_other" class="form-control m-input" value="{{ obj.getTIPriceOther }}">

2
templates/customer/form.html.twig
View file

@ -375,7 +375,7 @@
<span class="m-switch m-switch--icon block-switch">
<label>
<input type="checkbox" name="flag_motolite_battery" id="flag-motolite-battery" value="1">
<label class="switch-label">This vehicle is using a Motolite battery</label>
<label class="switch-label">{% trans %}add_cust_vehicle_battery_info{% endtrans %}</label>
<span></span>
</label>
</span>

8
templates/login.html.twig
View file

@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<title>
Motolite Res-Q | Login
{% trans %}title_login{% endtrans %}
</title>
<meta name="description" content="Latest updates and statistic charts">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -24,7 +24,7 @@
<link href="/assets/vendors/base/vendors.bundle.css" rel="stylesheet" type="text/css" />
<link href="/assets/demo/default/base/style.bundle.css" rel="stylesheet" type="text/css" />
<!--end::Base Styles -->
<link rel="shortcut icon" href="/assets/demo/default/media/img/logo/favicon.ico" />
<link rel="shortcut icon" href="{% trans %}icon_login{% endtrans %}" />
</head>
<!-- end::Head -->
<!-- end::Body -->
@ -36,13 +36,13 @@
<div class="m-login__container">
<div class="m-login__logo">
<a href="#">
<img alt="Res-Q" src="/assets/images/logo-resq.png">
<img alt="{% trans %}alt_image_logo_login{% endtrans %}" src="{% trans %}image_logo_login{% endtrans %}">
</a>
</div>
<div class="m-login__signin">
<div class="m-login__head">
<h3 class="m-login__title">
Sign-in to Control Panel
{% trans %}control_panel_sign_in{% endtrans %}
</h3>
</div>
<form class="m-login__form m-form" action="{{ path('login') }}" method="post">

0
translations/.gitignore vendored Normal file
View file

20
translations/messages.en.yaml Normal file
View file

@ -0,0 +1,20 @@
# text
title_login: Motolite Res-Q | Login
block_title: Motolite Res-Q
control_panel_sign_in: Sign-in to Control Panel
alt_image_logo_login: Res-Q
alt_image_dashboard: Motolite
copyright: Motolite Res-Q
battery_size_tradein_brand: Trade-in Motolite
battery_size_tradein_premium: Trade-in Premium
battery_size_tradein_other: Trade-in Other
add_cust_vehicle_battery_info: This vehicle is using a Motolite battery
jo_title_pdf: Motolite Res-Q Job Order
# # images
image_logo_login: /assets/images/logo-resq.png
icon_login: /assets/demo/default/media/img/logo/favicon.ico
icon_base_32x32: /assets/images/favicon/favicon-32x32.png
icon_base_16x16: /assets/images/favicon/favicon-16x16.png
image_dashboard: /assets/images/logo-motolite.png
image_jo_pdf: /public/assets/images/logo-resq.png

19
translations/moogle.en.yaml Normal file
View file

@ -0,0 +1,19 @@
# text
title_login: Moogle Test | Login
block_title: Moogle Test
control_panel_sign_in: Moogle Test
alt_image_logo_login: Moogle
alt_image_dashboard: Moogle
copyright: Mognet Central
battery_size_tradein_brand: Trade-in Moogle
battery_size_tradein_premium: Trade-in Mog
battery_size_tradein_other: Trade-in Kupo
add_cust_vehicle_battery_info: This vehicle is using a Moogle battery
jo_title_pdf: Moogle Job Order
# images
image_logo_login: /moogle-assets/74fdd1d049be99432a128ee40e93bff7.png
icon_login: /moogle-assets/moogleicon.ico
icon_base: /moogle-assets/moogleicon.ico
image_dashboard: /moogle-assets/yello_moogle.ico
image_jo_pdf: /public/moogle-assets/74fdd1d049be99432a128ee40e93bff7.png

20
translations/resq.messages.en.yaml Normal file
View file

@ -0,0 +1,20 @@
# text
title_login: Motolite Res-Q | Login
block_title: Motolite Res-Q
control_panel_sign_in: Sign-in to Control Panel
alt_image_logo_login: Res-Q
alt_image_dashboard: Motolite
copyright: Motolite Res-Q
battery_size_tradein_brand: Trade-in Motolite
battery_size_tradein_premium: Trade-in Premium
battery_size_tradein_other: Trade-in Other
add_cust_vehicle_battery_info: This vehicle is using a Motolite battery
jo_title_pdf: Motolite Res-Q Job Order
# images
image_logo_login: /assets/images/logo-resq.png
icon_login: /assets/demo/default/media/img/logo/favicon.ico
icon_base_32x32: /assets/images/favicon/favicon-32x32.png
icon_base_16x16: /assets/images/favicon/favicon-16x16.png
image_dashboard: /assets/images/logo-motolite.png
image_jo_pdf: /public/assets/images/logo-resq.png