Cadoles/schedule
21
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

api_dolibarr #53

Manually merged
mlamalle merged 6 commits from api_dolibarr into master 2020-11-03 09:55:48 +01:00
Conversation 0 Commits 6 Files Changed 9 +6 -1
4 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 62e7339057 - Show all commits

1
src/schedule-2.0/.env
View File

@@ -66,5 +66,6 @@ MAILER_URL=
## Sentry DSN ## Sentry DSN
SENTRY_DSN= SENTRY_DSN=
DOLIBARR_ACTIVE=false
DOLIBARR_API_KEY= DOLIBARR_API_KEY=
DOLIBARR_URI= DOLIBARR_URI=

1
src/schedule-2.0/config/services.yaml
View File

@@ -21,6 +21,7 @@ parameters:
casFirstname: '%env(resolve:CAS_FIRSTNAME)%' casFirstname: '%env(resolve:CAS_FIRSTNAME)%'
officeHourStart: '%env(resolve:OFFICE_HOUR_START)%' officeHourStart: '%env(resolve:OFFICE_HOUR_START)%'
officeHourEnd: '%env(resolve:OFFICE_HOUR_END)%' officeHourEnd: '%env(resolve:OFFICE_HOUR_END)%'
doliActive: '%env(resolve:DOLIBARR_ACTIVE)%'
doliApiKey: '%env(resolve:DOLIBARR_API_KEY)%' doliApiKey: '%env(resolve:DOLIBARR_API_KEY)%'
doliUri: '%env(resolve:DOLIBARR_URI)%' doliUri: '%env(resolve:DOLIBARR_URI)%'

3
src/schedule-2.0/src/Controller/OfferController.php
View File

@@ -35,7 +35,7 @@ class OfferController extends AbstractController
"services" => $services, "services" => $services,
"useheader" => true, "useheader" => true,
"usesidebar" => true, "usesidebar" => true,
"fgprint" => true, "fgprint" => true,
]); ]);
return new PdfResponse( return new PdfResponse(
@@ -48,6 +48,7 @@ class OfferController extends AbstractController
"services" => $services, "services" => $services,
"useheader" => true, "useheader" => true,
"usesidebar" => true, "usesidebar" => true,
"doliactive" => $this->getParameter('doliActive'),
]); ]);
} }
} }

2
src/schedule-2.0/templates/Offer/list.html.twig
View File

@@ -22,7 +22,9 @@
</h1> </h1>
<a class="btn btn-success" href={{ path('app_offer_submit') }}>Ajouter</a> <a class="btn btn-success" href={{ path('app_offer_submit') }}>Ajouter</a>
{% if doliactive %}
<a class="btn btn-success" href={{ path('app_offer_getorders') }}>Récupérer les commandes de Dolibarr</a> <a class="btn btn-success" href={{ path('app_offer_getorders') }}>Récupérer les commandes de Dolibarr</a>
{% endif %}
<div class="custom-control custom-switch float-right"> <div class="custom-control custom-switch float-right">
<input type="checkbox" class="custom-control-input" id="switchactiveproject" {% if app.session.get('activeproject') %} checked {% endif %}> <input type="checkbox" class="custom-control-input" id="switchactiveproject" {% if app.session.get('activeproject') %} checked {% endif %}>