Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adiciona opção para selecionar planos cadastrados na Vindi #72

Merged
merged 67 commits into from
Jun 5, 2020
Merged

Adiciona opção para selecionar planos cadastrados na Vindi #72

merged 67 commits into from
Jun 5, 2020

Commits on Jul 19, 2018

  1. #11177 Iniciado criação do meio de pagamento por cartão de crédito

    leonardo albuquerque committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    b19af91 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2018

  1. #11177 adicionado estrutura base

    leonardo albuquerque committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    63e2bae View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/11177/estrutura-basica' into 111… 

    …77/estrutura-basica
    leonardo albuquerque committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    287ec2a View commit details
    Browse the repository at this point in the history

  3. #11177 adicionada estrutura base

    leonardo albuquerque committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    b157a82 View commit details
    Browse the repository at this point in the history

  4. resolvido conflitos

    leonardo albuquerque committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    af3269e View commit details
    Browse the repository at this point in the history

  5. #11177 removido arquivos não necessários para esta release

    leonardo albuquerque committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    4c6f977 View commit details
    Browse the repository at this point in the history

  6. Merge branch '11177/base' into 11177/estrutura-basica

    leonardo albuquerque committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    2928a73 View commit details
    Browse the repository at this point in the history

  7. #11177 iniciado implementação do checkout

    leonardo albuquerque committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    4f7f874 View commit details
    Browse the repository at this point in the history

  8. #11177 iniciado criação da opção no carrinho

    leonardo albuquerque committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    4df926c View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2018

  1. #11177 criado form para adicionar os dados do cartão de crédito

    leonardo albuquerque committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    b258b11 View commit details
    Browse the repository at this point in the history

  2. #11177 agora é possível salvar os dados do cartão na ordem de compra

    leonardo albuquerque committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    cfe3507 View commit details
    Browse the repository at this point in the history

  3. #11177 iniciado implementação do bloco de info da ordem

    leonardo albuquerque committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    baac7ca View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2018

  1. #11177 agora é mostrado os dados do cartão de crédito na area admin

    leonardo albuquerque committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    da0c116 View commit details
    Browse the repository at this point in the history

  2. #11177 removido coisas desnecessárias

    leonardo albuquerque committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    f9f5fa1 View commit details
    Browse the repository at this point in the history

  3. #11177 adicionado campo para nome no cartão de crédito

    leonardo albuquerque committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    00db28e View commit details
    Browse the repository at this point in the history

  4. #11177 atualizado rota para controller

    leonardo albuquerque committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    bb55fa9 View commit details
    Browse the repository at this point in the history

  5. Merge branch '11177/base' into save-data

    leonardo albuquerque committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    07c8f78 View commit details
    Browse the repository at this point in the history

  6. #11177 corrigido nome dos cartões de crédito, removido códigos não ne… 

    …cessários nesta release
    leonardo albuquerque committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    00b6e73 View commit details
    Browse the repository at this point in the history

  7. #11177 removido array de status

    leonardo albuquerque committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    f241680 View commit details
    Browse the repository at this point in the history

  8. corrigido conflitos 

    Merge branch 'master' of github.com:vindi/vindi-magento2

# Conflicts:
#	README.md
#	app/code/Vindi/Payment/Model/Payment/Vindi.php
#	app/code/Vindi/Payment/etc/adminhtml/system.xml
#	app/code/Vindi/Payment/etc/config.xml
#	app/code/Vindi/Payment/etc/frontend/routes.xml
#	app/code/Vindi/Payment/etc/module.xml
#	app/code/Vindi/Payment/etc/payment.xml
#	app/code/Vindi/Payment/view/frontend/layout/checkout_index_index.xml
#	app/code/Vindi/Payment/view/frontend/web/template/payment/vindi.html
    leonardo albuquerque committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    0405c94 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'save-data' 

    # Conflicts:
#	app/code/Vindi/Payment/Model/Payment/Vindi.php
#	app/code/Vindi/Payment/etc/adminhtml/system.xml
#	app/code/Vindi/Payment/etc/config.xml
#	app/code/Vindi/Payment/etc/module.xml
#	app/code/Vindi/Payment/etc/payment.xml
#	app/code/Vindi/Payment/view/frontend/layout/checkout_index_index.xml
    leonardo albuquerque committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    8013036 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2018

  1. Merge remote-tracking branch 'upstream/master'

    leonardo albuquerque committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    e185814 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2018

  1. Merge remote-tracking branch 'upstream/master'

    leonardo albuquerque committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    6483ec0 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2018

  1. Merge branch 'master' of github.com:vindi/vindi-magento2

    leonardo albuquerque committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    00b33a5 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2018

  1. Merge remote-tracking branch 'upstream/master'

    leonardo albuquerque committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    7a7abfd View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2018

  1. Merge github.com:vindi/vindi-magento2

    leonardo albuquerque committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    caaa1e6 View commit details
    Browse the repository at this point in the history

  2. Merge github.com:vindi/vindi-magento2

    leonardo albuquerque committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    a0633ea View commit details
    Browse the repository at this point in the history

  3. Merge github.com:vindi/vindi-magento2

    leonardo albuquerque committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    87ced05 View commit details
    Browse the repository at this point in the history

  4. Merge github.com:vindi/vindi-magento2

    leonardo albuquerque committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    7fa35c9 View commit details
    Browse the repository at this point in the history

  5. movido arquivos para base para poder utilizar modman e composer

    leonardo albuquerque committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    5eaeefd View commit details
    Browse the repository at this point in the history

  6. Merge github.com:vindi/vindi-magento2

    leonardo albuquerque committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    a784bac View commit details
    Browse the repository at this point in the history

  7. Merge github.com:vindi/vindi-magento2

    leonardo albuquerque committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    05b9a1d View commit details
    Browse the repository at this point in the history

  8. adicionado seletor para status da ordem ao ser confirmada

    leonardo albuquerque committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    1ed2413 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2018

  1. corrigido chamada da função createCustomer fix vindi#30

    leonardo albuquerque committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    51e5851 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2018

  1. Merge branch 'master' of https://github.com/vindi/vindi-magento2

    @brunoroeder
    brunoroeder committed Aug 22, 2018
    Configuration menu
    Copy the full SHA
    74501bb View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2018

  1. validation for existence of some payment method and validation of fil… 

    …ling the token field in the configurations of the module
    @cris-silveira
    cris-silveira committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    329d88e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from trezoteam/erros-apontados-pelo-qa-do-magen… 

    …to-marketplace

validation for existence of some payment method and validation of fil…
    @cristhianss
    cristhianss authored Oct 26, 2018
    Configuration menu
    Copy the full SHA
    b49737c View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2019

  1. Merge remote-tracking branch 'upstream/master'

    Gabriel Ranghetti committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    06f3518 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2019

  1. Merge branch 'master' of https://github.com/vindi/vindi-magento2

    Gabriel Ranghetti committed May 17, 2019
    Configuration menu
    Copy the full SHA
    fbb20e3 View commit details
    Browse the repository at this point in the history

  2. fix ApiKeyValidator Exception Phrase

    Gabriel Ranghetti committed May 17, 2019
    Configuration menu
    Copy the full SHA
    c37b3c5 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2019

  1. Envia valores de desconto e acréscimos para a Vindi

    @Maikco
    Maikco committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    da95390 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2019

  1. Update Model/Payment/Product.php 

    Co-Authored-By: Laerte Guimarães <31661772+laerte-guimaraes@users.noreply.github.com>
    @Maikco @laerte-guimaraes
    Maikco and laerte-guimaraes authored Jul 29, 2019
    Configuration menu
    Copy the full SHA
    795c32a View commit details
    Browse the repository at this point in the history

  2. Update Model/Payment/Product.php 

    Co-Authored-By: Laerte Guimarães <31661772+laerte-guimaraes@users.noreply.github.com>
    @Maikco @laerte-guimaraes
    Maikco and laerte-guimaraes authored Jul 29, 2019
    Configuration menu
    Copy the full SHA
    021cecc View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2019

  1. Update Model/Payment/Product.php 

    Co-Authored-By: Laerte Guimarães <31661772+laerte-guimaraes@users.noreply.github.com>
    @Maikco @laerte-guimaraes
    Maikco and laerte-guimaraes authored Jul 30, 2019
    Configuration menu
    Copy the full SHA
    3e0f784 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2019

  1. Inicio dos testes de cupons, taxas e frete

    @hawshinka
    hawshinka committed Aug 15, 2019
    Configuration menu
    Copy the full SHA
    88851a7 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2019

  1. Correções nos mocks das respostas esperadas

    @hawshinka
    hawshinka committed Aug 16, 2019
    Configuration menu
    Copy the full SHA
    d753896 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:haw-trezo/vindi-magento2

    @hawshinka
    hawshinka committed Aug 16, 2019
    Configuration menu
    Copy the full SHA
    b8168dc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/ajuste_no_envio_de_informacoes_com… 

    …_testes
    @hawshinka
    hawshinka committed Aug 16, 2019
    Configuration menu
    Copy the full SHA
    3df9ebd View commit details
    Browse the repository at this point in the history

  4. Trocar o nome da classe

    @hawshinka
    hawshinka committed Aug 16, 2019
    Configuration menu
    Copy the full SHA
    eeaf859 View commit details
    Browse the repository at this point in the history

  5. Testes nas mudanças de status para pedidos com boletos

    @hawshinka
    hawshinka committed Aug 16, 2019
    Configuration menu
    Copy the full SHA
    613c1de View commit details
    Browse the repository at this point in the history

  6. Testes nos status dos pedidos de acordo com os meios de pagamento

    @hawshinka
    hawshinka committed Aug 16, 2019
    Configuration menu
    Copy the full SHA
    36f9a34 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2 from haw-trezo/feature/trezo_unit_tests 

    Feature/trezo unit tests
    @brunoroeder
    brunoroeder authored Aug 16, 2019
    Configuration menu
    Copy the full SHA
    c85911a View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2019

  1. Merge branch 'master' of github.com:vindi/vindi-magento2

    @hawshinka
    hawshinka committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    93cab97 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/trezo_unit_tests

    @hawshinka
    hawshinka committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    b7a8353 View commit details
    Browse the repository at this point in the history

  3. Ajustes nos testes para conformidade com PR 55

    @hawshinka
    hawshinka committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    6da4ea7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3 from haw-trezo/feature/trezo_unit_tests 

    Feature/trezo unit tests
    @brunoroeder
    brunoroeder authored Aug 22, 2019
    Configuration menu
    Copy the full SHA
    45181cc View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2019

  1. Insere informações de Teste

    @laerte-guimaraes
    laerte-guimaraes authored Aug 29, 2019
    Configuration menu
    Copy the full SHA
    1352283 View commit details
    Browse the repository at this point in the history

  2. Ajusta link de download

    @laerte-guimaraes
    laerte-guimaraes authored Aug 29, 2019
    Configuration menu
    Copy the full SHA
    4b9ef6f View commit details
    Browse the repository at this point in the history

Commits on May 21, 2020

  1. Atualizado com o projeto original

    @Maikco
    Maikco committed May 21, 2020
    Configuration menu
    Copy the full SHA
    1bc5b6c View commit details
    Browse the repository at this point in the history

Commits on May 23, 2020

  1. Atualizando o status da assinatura no Magento

    @Maikco
    Maikco committed May 23, 2020
    Configuration menu
    Copy the full SHA
    d117f48 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2020

  1. Possibilidade de associar o produto bundle no Magento a um plano exis… 

    …tente na Vindi.
    @Maikco
    Maikco committed May 31, 2020
    Configuration menu
    Copy the full SHA
    7737f36 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/vindi/vindi-magento2

    @Maikco
    Maikco committed May 31, 2020
    Configuration menu
    Copy the full SHA
    abb2344 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feature/VIND-33-usar-plano-da-vindi

    @Maikco
    Maikco committed May 31, 2020
    Configuration menu
    Copy the full SHA
    3861bfe View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2020

  1. Update Setup/UpgradeData.php 

    Co-authored-by: Laerte Guimarães <31661772+laerte-guimaraes@users.noreply.github.com>
    @Maikco @laerte-guimaraes
    Maikco and laerte-guimaraes authored Jun 1, 2020
    Configuration menu
    Copy the full SHA
    7b9fcfc View commit details
    Browse the repository at this point in the history

  2. Update i18n/pt_BR.csv 

    Co-authored-by: Laerte Guimarães <31661772+laerte-guimaraes@users.noreply.github.com>
    @Maikco @laerte-guimaraes
    Maikco and laerte-guimaraes authored Jun 1, 2020
    Configuration menu
    Copy the full SHA
    ab8d50a View commit details
    Browse the repository at this point in the history

  3. Update Model/Config/Source/Plan.php 

    Co-authored-by: Laerte Guimarães <31661772+laerte-guimaraes@users.noreply.github.com>
    @Maikco @laerte-guimaraes
    Maikco and laerte-guimaraes authored Jun 1, 2020
    Configuration menu
    Copy the full SHA
    98a6aa6 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2020

  1. Merge branch 'master' into feature/VIND-33-usar-plano-da-vindi

    @Maikco
    Maikco authored Jun 5, 2020
    Configuration menu
    Copy the full SHA
    65dbdbb View commit details
    Browse the repository at this point in the history