Commit a1aa6e9c authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Versements : On peut passer en réalisé un versement depuis la liste des versements

parent 1c6459cd

module/Oscar/src/Oscar/Controller/ActivityPaymentController.php

+5 −0
Original line number Diff line number Diff line
@@ -229,9 +229,14 @@ class ActivityPaymentController extends AbstractOscarController implements UseSe 
              'to' => $to,

            ];



            $url_manage = "";

            if( $this->getOscarUserContextService()->hasPrivileges(Privileges::ACTIVITY_PAYMENT_MANAGE) ) {

                $url_manage = $this->url()->fromRoute('activitypayment_rest', ['idactivity' => '']);

            }

            $out = [

                'params' => $this->vueJsParamJsonBase64([

                    'url_activity' => $this->url()->fromRoute('contract/show', ['id' => '']),

                    'url_manage' => $url_manage

                ]),

            ];

module/Oscar/src/Oscar/Entity/Repository/ActivityPaymentRepository.php

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ class ActivityPaymentRepository extends EntityRepository 
            p.datepayment,

            p.comment,

            p.codetransaction,

            a.id as activity_id,

            a.label as activity_label,

            a.codeEOTP as activity_numfinancier,

            a.oscarNum as activity_oscarnum,

module/Oscar/view/oscar/public/index.phtml

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ if (file_exists(__DIR__ . '/../../../../../data/home.html')): 
    $cols++;

    ob_start() ?>

    <section class="section-home section-home-todo">

        <h3><i class="icon-pin"></i>A FAIRE</h3>

        <div id="genericvue" data-params="<?= $paramsTodo ?>"></div>

        <?= $this->Vite()->addJs('src/PersonTodoList.js'); ?>

    </section>

ui/src/views/PersonTodoList.vue

+1 −0
Original line number Diff line number Diff line 
<template>

  <h3 v-if="todos.length"><i class="icon-pin"></i>A FAIRE</h3>

  <div v-for="i in todosSorted">

    <ActivityPaymentItem

        :url_activity="url_activity"